Proper username handling in case of auto signup (closes #441)