Added weak service check for non-admin users