Bugfixes on AUTH module. Solving issue #1