users cant sign up, working on admin control panel
merge fix