Fix multi-login prompt and SQL errors
Merge branch 'master' of github.com:adr2370/MockTok