Changing user.rb file acc to global rules after nikhil rev