Remove database_recoverable etc from user model
Put login stuff in a method