bug 569: changed the order of the lines according to the patch request
bug 569: fixed fatal if clause
Merge branch 'bug-569' into testserver-stable

Conflicts:
	includes/account.php
	www/wot.php
Revert "bug 964: Reduce variable scope where possible"

This reverts commit 387fde16ca52b6ccfc5a46be99219cd09a7411ce.
Decision based on discussion with Michael Tänzer.
Merge branch 'bug-964' into testserver-stable