bug #4278 reCaptcha re-login requires double effort

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge branch 'QA_4_1'