Tweaked Devise to satisfaction