Added usernames to Users and preliminary logins work