diff --git a/lib/fog/aws/models/iam/access_keys.rb b/lib/fog/aws/models/iam/access_keys.rb
index 2a834b9b66..c2cdbbeccc 100644
--- a/lib/fog/aws/models/iam/access_keys.rb
+++ b/lib/fog/aws/models/iam/access_keys.rb
@@ -13,8 +13,6 @@ def initialize(attributes = {})
 
         def all
           data = service.list_access_keys('UserName'=> @username).body['AccessKeys']
-          # AWS response doesn't contain the UserName, this injects it
-          data.each {|access_key| access_key['UserName'] = @username }
           load(data)
         end
 
diff --git a/lib/fog/aws/parsers/iam/list_access_keys.rb b/lib/fog/aws/parsers/iam/list_access_keys.rb
index fb141b3cf0..f8477333bd 100644
--- a/lib/fog/aws/parsers/iam/list_access_keys.rb
+++ b/lib/fog/aws/parsers/iam/list_access_keys.rb
@@ -10,7 +10,7 @@ def reset
 
           def end_element(name)
             case name
-            when 'AccessKeyId', 'Status', 'Username'
+            when 'AccessKeyId', 'Status', 'UserName'
               @access_key[name] = value
             when 'member'
               @response['AccessKeys'] << @access_key