Changed signup from email to username
merging