diff --git a/src/client/accounts/accounts-manager.vala b/src/client/accounts/accounts-manager.vala
index 9cc46078895cc545fd9b52399703e6a08a8e8e76..b8bbc982336beed47b6ee994dd7560c331064be8 100644
--- a/src/client/accounts/accounts-manager.vala
+++ b/src/client/accounts/accounts-manager.vala
@@ -1396,7 +1396,7 @@ public class Accounts.ServiceConfigV1 : ServiceConfig, GLib.Object {
         string? login = service_config.get_string(LOGIN, null);
         if (login != null) {
             service.credentials = new Geary.Credentials(
-                Credentials.PASSWORD, login
+                Geary.Credentials.Method.PASSWORD, login
             );
         }
         service.remember_password = service_config.get_bool(
@@ -1500,7 +1500,7 @@ public class Accounts.ServiceConfigLegacy : ServiceConfig, GLib.Object {
         );
         if (login != null) {
             service.credentials = new Geary.Credentials(
-                Credentials.PASSWORD, login
+                Geary.Credentials.Method.PASSWORD, login
             );
         }
         service.remember_password = service_config.get_bool(
diff --git a/src/engine/api/geary-service-information.vala b/src/engine/api/geary-service-information.vala
index 2028e04022ea70f16eb99be77e43785a96db5c8a..6df8fb494a63876418a4dd5c3646970a433d087c 100644
--- a/src/engine/api/geary-service-information.vala
+++ b/src/engine/api/geary-service-information.vala
@@ -135,7 +135,7 @@ public class Geary.ServiceInformation : GLib.Object {
      */
     public ServiceInformation.copy(ServiceInformation other) {
         // Use OTHER here to get blank defaults
-        this(other.protocol, ServiceInformation.OTHER);
+        this(other.protocol, ServiceProvider.OTHER);
         this.host = other.host;
         this.port = other.port;
         this.transport_security = other.transport_security;