Authentication/Authorization fixed