diff --git a/profile.cc b/profile.cc
index f9c568b..e73f784 100644
--- a/profile.cc
+++ b/profile.cc
@@ -165,13 +165,19 @@
   return service->Save(storage_.get()) && storage_->Flush();
 }
 
-bool Profile::ConfigureService(const ServiceRefPtr &service) {
+bool Profile::LoadService(const ServiceRefPtr &service) {
   if (!ContainsService(service))
     return false;
-  service->SetProfile(this);
   return service->Load(storage_.get());
 }
 
+bool Profile::ConfigureService(const ServiceRefPtr &service) {
+  if (!LoadService(service))
+    return false;
+  service->SetProfile(this);
+  return true;
+}
+
 bool Profile::ConfigureDevice(const DeviceRefPtr &device) {
   return device->Load(storage_.get());
 }