Fix UI Error message
fix last commit
Merge branch 'lisa' into UserLogin