diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb
index 739cbd63c..36e7b5b52 100644
--- a/app/controllers/users/sessions_controller.rb
+++ b/app/controllers/users/sessions_controller.rb
@@ -45,8 +45,8 @@ class Users::SessionsController < Devise::SessionsController
     end
   end
 
-  def after_sign_in
-    flash[:system_notification_modal] = true
+  def create
+    super
 
     # Schedule templates creation for user
     TemplatesService.new.schedule_creation_for_user(current_user)
@@ -60,6 +60,10 @@ class Users::SessionsController < Devise::SessionsController
     end
   end
 
+  def after_sign_in
+    flash[:system_notification_modal] = true
+  end
+
   protected
 
   # If you have extra params to permit, append them to the sanitizer.