fixed login conflict