pre-devise commit
migrated to devise