Manually reapplied changes, fixed NPE caused by not restoring columns after sign in