fixing issues with first time login