X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ec34701537a4de8f7aff3b7f91b4402367ebb22a..ea94b2feb2cba9ee11b728256a8c947fb46f8493:/apps/workbench/app/controllers/users_controller.rb

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 805d0d2e80..67b51a9bc9 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -257,13 +257,13 @@ class UsersController < ApplicationController
       key_params['authorized_user_uuid'] = current_user.uuid
 
       if params['name'] && params['name'].size>0
-        key_params['name'] = params['name']
+        key_params['name'] = params['name'].strip
       end
       if params['public_key'] && params['public_key'].size>0
-        key_params['public_key'] = params['public_key']
+        key_params['public_key'] = params['public_key'].strip
       end
 
-      if !key_params['name']
+      if !key_params['name'] && params['public_key'].andand.size>0
         split_key = key_params['public_key'].split
         key_params['name'] = split_key[-1] if (split_key.size == 3)
       end