Cleanup

* Remove uneeded calls for output variables
* Correct style for output
* Add password recovery link