Fix concurrent username logins
Merge pull request #343 from bcyrill/cp_conc

Fix concurrent username logins