Fixed problem with erroneous session creation
Finished transition to password/username combo