Issue #41 Fixed Authentication