Fix for #1144; $caneditdomain get lost when security_questions are necessary

Hi,

new try, this time every patch as a own branch...

Hope this will be better this way, please give feedback.

Benjamin