diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index c05d1172c..c1b38fa39 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -140,6 +140,15 @@ class AccountController < ApplicationController
           @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
         end
 
+        if(@cache_identityy == "")
+          flash.now[:error]= l(:label_identity)+l(:'activerecord.errors.messages.empty')
+          return
+        end
+        if(@cache_city == "")
+          flash.now[:error]= l(:label_location)+l(:'activerecord.errors.messages.empty')
+          return
+        end
+
         case Setting.self_registration
         when '1'
           register_by_email_activation(@user)