Fixes #79 - Cleaned up UsersController

Fixes #79