diff --git a/app/models/api/openid_connect/o_auth_application.rb b/app/models/api/openid_connect/o_auth_application.rb
index 8fc4c6dc373141e00287447c122f18e09ba24a7a..6ade4b9a8409fa9b50b695acc1325449195c0e5f 100644
--- a/app/models/api/openid_connect/o_auth_application.rb
+++ b/app/models/api/openid_connect/o_auth_application.rb
@@ -6,8 +6,7 @@ module Api
 
       validates :client_id, presence: true, uniqueness: true
       validates :client_secret, presence: true
-      validates :client_name, presence: true
-      validates_uniqueness_of :client_name, scope: :redirect_uris
+      validates :client_name, presence: true, uniqueness: {scope: :redirect_uris}
 
       %i(redirect_uris response_types grant_types contacts).each do |serializable|
         serialize serializable, JSON
diff --git a/app/views/api/openid_connect/authorizations/_grants_list.haml b/app/views/api/openid_connect/authorizations/_grants_list.haml
index 0223043037d8f43d311957d1c87bc321d3dc1dc2..72c18322119a475a30968b3f772ca919b0a7852a 100644
--- a/app/views/api/openid_connect/authorizations/_grants_list.haml
+++ b/app/views/api/openid_connect/authorizations/_grants_list.haml
@@ -5,7 +5,7 @@
     %i.entypo-browser
 .application-authorizations
   - if app[:authorizations].count > 0
-    %h4=t("api.openid_connect.authorizations.new.access", name: app[:name])
+    %h4= t("api.openid_connect.authorizations.new.access", name: app[:name])
     %ul
       - app[:authorizations].each do |authorization|
         %li
@@ -13,4 +13,4 @@
           %p= t("api.openid_connect.scopes.#{authorization}.description")
   - else
     .well
-      =t("api.openid_connect.authorizations.new.no_requirement", name: app[:name])
+      = t("api.openid_connect.authorizations.new.no_requirement", name: app[:name])
diff --git a/app/views/api/openid_connect/user_applications/_add_remove_applications.haml b/app/views/api/openid_connect/user_applications/_add_remove_applications.haml
index 28afb902117e02ef26603e6dcab23d78d947c076..4837111f673ee2d41fd4ecebd3174f0b95421322 100644
--- a/app/views/api/openid_connect/user_applications/_add_remove_applications.haml
+++ b/app/views/api/openid_connect/user_applications/_add_remove_applications.haml
@@ -4,7 +4,7 @@
       %li.list-group-item.authorized-application
         = render "grants_list", app: app
         = form_for "application", url: "#{api_openid_connect_authorizations_path}/#{app[:id]}",
-            html: { method: :delete, class: "form-horizontal"} do |f|
+            html: {method: :delete, class: "form-horizontal"} do |f|
           .clearfix= f.submit t("api.openid_connect.user_applications.revoke_autorization"),
             class: "btn btn-danger pull-right app-revoke"
 
diff --git a/app/views/api/openid_connect/user_applications/_grants_list.haml b/app/views/api/openid_connect/user_applications/_grants_list.haml
index e2c67b8ffc4097480d3177fe137285bb2ef78132..4b11c0030b13c9c09f4985f51dbe16a05757b413 100644
--- a/app/views/api/openid_connect/user_applications/_grants_list.haml
+++ b/app/views/api/openid_connect/user_applications/_grants_list.haml
@@ -5,7 +5,7 @@
     %i.entypo-browser
 .application-authorizations
   - if app[:authorizations].count > 0
-    %h4=t("api.openid_connect.user_applications.index.access", name: app[:name])
+    %h4= t("api.openid_connect.user_applications.index.access", name: app[:name])
     %ul
       - app[:authorizations].each do |authorization|
         %li
@@ -13,4 +13,4 @@
           %p= t("api.openid_connect.scopes.#{authorization}.description")
   - else
     .well
-      =t("api.openid_connect.user_applications.index.no_requirement",name: app[:name])
+      = t("api.openid_connect.user_applications.index.no_requirement", name: app[:name])
diff --git a/app/views/shared/_settings_nav.mobile.haml b/app/views/shared/_settings_nav.mobile.haml
index a85537dcb11eb09f174ba7ceb5600631825150d5..aaeb0b319c5f446518513dfd7d3516e7e6645a78 100644
--- a/app/views/shared/_settings_nav.mobile.haml
+++ b/app/views/shared/_settings_nav.mobile.haml
@@ -1,9 +1,9 @@
 #settings_nav
-  %h2= t('settings')
+  %h2= t("settings")
   %nav
     %ul
-      %li= link_to_unless_current t('profile'), edit_profile_path
-      %li= link_to_unless_current t('account'), edit_user_path
-      %li= link_to_unless_current t('privacy'), privacy_settings_path
-      %li= link_to_unless_current t('_services'), services_path
-      %li= link_to_unless_current t('_applications'), api_openid_connect_user_applications_path
+      %li= link_to_unless_current t("profile"), edit_profile_path
+      %li= link_to_unless_current t("account"), edit_user_path
+      %li= link_to_unless_current t("privacy"), privacy_settings_path
+      %li= link_to_unless_current t("_services"), services_path
+      %li= link_to_unless_current t("_applications"), api_openid_connect_user_applications_path
diff --git a/features/step_definitions/auth_code_steps.rb b/features/step_definitions/auth_code_steps.rb
index 3d0d11927b7604123e4649ec11089e9d0ecd1d47..bec5caa349ec74ad43aee10ba20a07410d1f32a8 100644
--- a/features/step_definitions/auth_code_steps.rb
+++ b/features/step_definitions/auth_code_steps.rb
@@ -1,4 +1,4 @@
-O_AUTH_QUERY_PARAMS = {
+O_AUTH_QUERY_PARAMS_WITH_CODE = {
   redirect_uri:  "http://localhost:3000",
   response_type: "code",
   scope:         "openid read",
@@ -10,12 +10,12 @@ Given /^I send a post request from that client to the code flow authorization en
   client_json = JSON.parse(last_response.body)
   @client_id = client_json["client_id"]
   @client_secret = client_json["client_secret"]
-  params = O_AUTH_QUERY_PARAMS.merge(client_id: @client_id)
+  params = O_AUTH_QUERY_PARAMS_WITH_CODE.merge(client_id: @client_id)
   visit new_api_openid_connect_authorization_path(params)
 end
 
 Given /^I send a post request from that client to the code flow authorization endpoint using a invalid client id/ do
-  params = O_AUTH_QUERY_PARAMS.merge(client_id: "randomid")
+  params = O_AUTH_QUERY_PARAMS_WITH_CODE.merge(client_id: "randomid")
   visit new_api_openid_connect_authorization_path(params)
 end