Login bug fix &
Vital change