Finally took a simple revision at users.py. Closes #55