Handle better notifications
Handle better login