Fixed issues with first login templates