Fixed & refactored guard conditions

3 jobs for feature/first-login in 23 seconds (queued for 1 second)