diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 787b1b050..d570c238e 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WelcomeController < ApplicationController
-  layout "base_welcome"
+  # layout "base_welcome"
   include ApplicationHelper
   include WelcomeHelper
   helper :project_score
diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index 7d7976bb5..1121c98b4 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -62,7 +62,7 @@ class UsersService
     else
       @user.password = ""
     end
-    @user = automatically_register(@user)
+    @user = automatically_register_lock(@user)
     if @user.id != nil
       ue = @user.user_extensions ||= UserExtensions.new
       ue.user_id = @user.id