diff --git a/webadmin/src/views/domains.html b/webadmin/src/views/domains.html
index 7027c6ac9..0ad14049c 100644
--- a/webadmin/src/views/domains.html
+++ b/webadmin/src/views/domains.html
@@ -214,12 +214,12 @@
                   {{ domain.domain }}
                 </td>
                 <td class="text-left elide-table-cell hidden-xs hidden-sm">
-                  {{ domain.config.provider }}
+                  {{ domain.provider }}
                 </td>
                 <td class="text-right no-wrap" style="vertical-align: bottom">
-                  <button class="btn btn-xs btn-default" ng-click="domainMigrate.show(domain)" ng-show="domain.domain !== config.fqdn && domain.config.provider !== 'caas' && config.provider === 'caas'" title="Migrate Domain"><i class="fa fa-exchange"></i></button>
-                  <button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" ng-show="domain.config.provider !== 'caas'" title="Edit Domain"><i class="fa fa-pencil"></i></button>
-                  <button class="btn btn-xs btn-danger" ng-hide="true" ng-click="domainRemove.show(domain)" ng-show="domain.config.provider !== 'caas'" title="Remove Domain"><i class="fa fa-trash-o"></i></button>
+                  <button class="btn btn-xs btn-default" ng-click="domainMigrate.show(domain)" ng-show="domain.domain !== config.fqdn && domain.provider !== 'caas' && provider === 'caas'" title="Migrate Domain"><i class="fa fa-exchange"></i></button>
+                  <button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" ng-show="domain.provider !== 'caas'" title="Edit Domain"><i class="fa fa-pencil"></i></button>
+                  <button class="btn btn-xs btn-danger" ng-hide="true" ng-click="domainRemove.show(domain)" ng-show="domain.provider !== 'caas'" title="Remove Domain"><i class="fa fa-trash-o"></i></button>
                 </td>
               </tr>
             </tbody>
diff --git a/webadmin/src/views/domains.js b/webadmin/src/views/domains.js
index d1d8218b0..d32ade923 100644
--- a/webadmin/src/views/domains.js
+++ b/webadmin/src/views/domains.js
@@ -76,12 +76,12 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
                         "credentials": domain.config.credentials
                     });
                 }
-                $scope.domainConfigure.digitalOceanToken = domain.config.provider === 'digitalocean' ? domain.config.token : '';
-                $scope.domainConfigure.cloudflareToken = domain.config.provider === 'cloudflare' ? domain.config.token : '';
+                $scope.domainConfigure.digitalOceanToken = domain.provider === 'digitalocean' ? domain.config.token : '';
+                $scope.domainConfigure.cloudflareToken = domain.provider === 'cloudflare' ? domain.config.token : '';
                 $scope.domainConfigure.cloudflareEmail = domain.config.email;
 
-                $scope.domainConfigure.provider = domain.config.provider;
-                $scope.domainConfigure.provider = ($scope.domainConfigure.provider === 'manual' && domain.config.wildcard) ? 'wildcard' : domain.config.provider;
+                $scope.domainConfigure.provider = domain.provider;
+                $scope.domainConfigure.provider = ($scope.domainConfigure.provider === 'manual' && domain.config.wildcard) ? 'wildcard' : domain.provider;
             } else {
                 $scope.domainConfigure.adding = true;
             }