added more conditional for the create user button
Merge remote-tracking branch 'origin/team1-dev' into team1-dev
Merge remote-tracking branch 'origin/team1-dev' into team1-dev
Merge remote-tracking branch 'origin/team1-dev' into team1-dev