Trying to fix merge errors
Merge branch 'gorlanwix-Feature-LoginVerification'

Trying to fix merge problems