fix login issue
Merge