Fixed Login based on username