Merge pull request #199 from Verkalets/fix-issue

Fix issue
Merge pull request #200 from Verkalets/fix-issue

Fix issue
forgot password
rm