TH-09 | Fix login tooltip
Fix merge conflict