Finally fixed Login