fix some situations with logging in and activating