Replace deprecated calls
Faster user login detection