Update with workaround on login