adjusted formatting to match whole auth module; added extra checks when E_NOTICE is supressed