Issue #79, Fix Authentication problem