Finish improve login