Added some more checks to sign up confirmation