More fix for signup issues