added check for last login
add firstLogni check
merge fix
Merge pull request #1360 from onepercentclub/feature/CLUB-631

Feature/club 631