Tweaks on login and additional trans