fixed login
merge from ql
remove line