Fixes for HS WÜ/SW
Fix crash on account loaded