Code clean up
Fix bug with client properties in deployment-specific settings
Fix problem with empty usernames