Issue #325 - Fixing login