Fixed conditional for first time login
Merging branches :S