diff --git a/user-add b/user-add
index 9110285..9736d6d 100755
--- a/user-add
+++ b/user-add
@@ -14,7 +14,14 @@ read -e -i $plusone new_uid
 echo Type username
 read -e new_user
 
+echo "Generate new key? (empty for no key)"
+read -e -i "id_rsa_$new_user" new_key
+
 echo data/users/"${new_uid}-${new_user}"
+if [[ -n "$new_key" ]]; then
+  ssh-keygen -f "$new_key" -C "$new_user"
+  cat "$new_key".pub >> data/users/"${new_uid}-${new_user}"
+fi
 echo Edit authorized_keys, or break process
 read foo