More robustness arround logon, should mitigate/fix #48