Continued work on user account functionality