diff --git a/rackspace/compute/v2/servers/requests.go b/rackspace/compute/v2/servers/requests.go
index 1e17eb9..d4472a0 100644
--- a/rackspace/compute/v2/servers/requests.go
+++ b/rackspace/compute/v2/servers/requests.go
@@ -117,7 +117,7 @@
 	// key_name doesn't actually come from the extension (or at least isn't documented there) so
 	// we need to add it manually.
 	serverMap := res["server"].(map[string]interface{})
-	if serverMap["key_name"] != "" {
+	if opts.KeyPair != "" {
 		serverMap["key_name"] = opts.KeyPair
 	}