Tried to fix the username problem, still need to assign user properly