diff --git a/endpoints/index.py b/endpoints/index.py
index dd3033c57..0e063882f 100644
--- a/endpoints/index.py
+++ b/endpoints/index.py
@@ -66,7 +66,7 @@ def generate_headers(role='read'):
 def create_user():
   user_data = request.get_json()
   username = user_data['username']
-  password = user_data['password']
+  password = user_data.get('password', '')
 
   # UGH! we have to use this response when the login actually worked, in order
   # to get the CLI to try again with a get, and then tell us login succeeded.