Changes to user.rb and application.rb