Fix syntax issues
Add more fields when editing/adding a user