diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/elementtype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/elementtype.resource.js
index a235bcda3e..acc0a94485 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/elementtype.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/elementtype.resource.js
@@ -8,21 +8,14 @@ function elementTypeResource($q, $http, umbRequestHelper) {
     return {
 
         getAll: function () {
-
-            var url = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + "/backoffice/UmbracoApi/ElementType/GetAll";
-            return umbRequestHelper.resourcePromise(
-                $http.get(url),
-                'Failed to retrieve element types'
-            );
             
-            /*
             return umbRequestHelper.resourcePromise(
                 $http.get(
                     umbRequestHelper.getApiUrl(
                         "elementTypeApiBaseUrl",
                         "GetAll")),
-                "Failed to retrieve data");
-            */
+                "Failed to retrieve element types");
+            
         }
 
     };
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 53865830d8..9e02b629f9 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -318,6 +318,10 @@ namespace Umbraco.Web.Editors
                             "imageUrlGeneratorApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<ImageUrlGeneratorController>(
                                 controller => controller.GetCropUrl(null, null, null, null, null))
                         },
+                        {
+                            "elementTypeApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl<ElementTypeController>(
+                                controller => controller.GetAll())
+                        },
                     }
                 },
                 {
diff --git a/src/Umbraco.Web/Editors/ElementTypeController.cs b/src/Umbraco.Web/Editors/ElementTypeController.cs
index 64dfbbb4ab..e49a5eb214 100644
--- a/src/Umbraco.Web/Editors/ElementTypeController.cs
+++ b/src/Umbraco.Web/Editors/ElementTypeController.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Web.Http;
 using Umbraco.Core.Services;
-using Umbraco.Web.Editors;
 using Umbraco.Web.Mvc;
 
 namespace Umbraco.Web.Editors
@@ -9,7 +9,7 @@ namespace Umbraco.Web.Editors
     [PluginController("UmbracoApi")]
     public class ElementTypeController : UmbracoAuthorizedJsonController
     {
-        [System.Web.Http.HttpGet]
+        [HttpGet]
         public IEnumerable<object> GetAll()
         {
             return Services.ContentTypeService