diff --git a/AUTHORS b/AUTHORS
index 2e40fe8dd..de855ed28 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,7 @@ Jake Dahn <admin@jakedahn.com>
 James E. Blair <james.blair@rackspace.com>
 Jason Kölker <jason@koelker.net>
 Jason Straw <jason.straw@rackspace.com>
+Jay Pipes <jaypipes@gmail.com>
 Jesse Andrews <anotherjesse@gmail.com>
 Johannes Erdfelt <johannes.erdfelt@rackspace.com>
 John Garbutt <john.garbutt@citrix.com>
diff --git a/novaclient/v1_1/keypairs.py b/novaclient/v1_1/keypairs.py
index d840be376..bb31e8657 100644
--- a/novaclient/v1_1/keypairs.py
+++ b/novaclient/v1_1/keypairs.py
@@ -26,7 +26,7 @@ class Keypair(base.Resource):
     """
 
     def __repr__(self):
-        return "<Keypair: %s>" % self.uuid
+        return "<Keypair: %s>" % self.id
 
     def _add_details(self, info):
         dico = 'keypair' in info and \