Avoid Blank screen on login (re-fix)

Re-fixing, since the previous fix doesn't work in all servers