diff --git a/app/models/authenticator/amazon.rb b/app/models/authenticator/amazon.rb
index c8eaab4366a..5b2bf556339 100644
--- a/app/models/authenticator/amazon.rb
+++ b/app/models/authenticator/amazon.rb
@@ -133,5 +133,9 @@ def aws_connect(access_key_id, secret_access_key, service = :IAM, proxy_uri = ni
         :log_formatter     => Aws::Log::Formatter.new(Aws::Log::Formatter.default.pattern.chomp)
       )
     end
+
+    def normalize_username(username)
+      username
+    end
   end
 end
diff --git a/spec/models/authenticator/amazon_spec.rb b/spec/models/authenticator/amazon_spec.rb
index 9c23cfe49eb..4033d86234c 100644
--- a/spec/models/authenticator/amazon_spec.rb
+++ b/spec/models/authenticator/amazon_spec.rb
@@ -1,8 +1,8 @@
 require 'aws-sdk'
 
 describe Authenticator::Amazon do
-  AWS_ROOT_USER_KEY = 'aws_root_key'
-  AWS_IAM_USER_KEY = 'aws_iam_key'
+  AWS_ROOT_USER_KEY = 'aws_root_key'.freeze
+  AWS_IAM_USER_KEY = 'AWS_IAM_KEY'.freeze
 
   subject { Authenticator::Amazon.new(config) }