Add an extra check to prevent sticking usernames clientside
Merge branch 'master' of github.com:calzoneman/sync