Added more of checks to signup confirmation. More to come