Fixing login and check in/out