cleanup + code fix

password forgotten should work