Issue #216 Fixed forgot password behaviour