Closes #804 Trim the username to avoid ' jdoe2' logins

#804