Users can log-in. Untz. Untz. Untz.
Fixes insignificant merge conflict in app controller.