Small simplification
remove redundant checks
Re-enable username constraint
remove some outdated comments