Auth SP fix and improvements