Merged ProjectSettingsController and AccountController