Add unlocking back into user create