diff --git a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Index/CreateIndexBuilder.cs b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Index/CreateIndexBuilder.cs
index c91c1de469..4d1396ff79 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Index/CreateIndexBuilder.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Index/CreateIndexBuilder.cs
@@ -57,6 +57,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Index
 
         public ICreateIndexOnColumnSyntax NonClustered()
         {
+            Expression.Index.IndexType = IndexTypes.NonClustered;
             Expression.Index.IsClustered = false;
             Expression.Index.IndexType = IndexTypes.NonClustered;
             Expression.Index.IsUnique = false;
@@ -65,6 +66,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Index
 
         public ICreateIndexOnColumnSyntax Clustered()
         {
+            Expression.Index.IndexType = IndexTypes.Clustered;
             Expression.Index.IsClustered = true;
             //if it is clustered then we have to change the index type set the other flags
             Expression.Index.IndexType = IndexTypes.Clustered;
@@ -75,6 +77,7 @@ namespace Umbraco.Core.Persistence.Migrations.Syntax.Create.Index
 
         ICreateIndexOnColumnSyntax ICreateIndexOptionsSyntax.Unique()
         {
+            Expression.Index.IndexType = IndexTypes.UniqueNonClustered;
             Expression.Index.IsUnique = true;
             return this;
         }
diff --git a/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlSyntaxProviderTests.cs b/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlSyntaxProviderTests.cs
index 3909a17847..cc94620476 100644
--- a/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlSyntaxProviderTests.cs
+++ b/src/Umbraco.Tests/Persistence/SyntaxProvider/SqlSyntaxProviderTests.cs
@@ -1,7 +1,11 @@
 using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Migrations.Syntax.Create.Index;
+using Umbraco.Core.Persistence.Migrations.Syntax.Expressions;
 using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Tests.Persistence.SyntaxProvider
@@ -39,6 +43,71 @@ namespace Umbraco.Tests.Persistence.SyntaxProvider
             }
         }
 
+        [Test]
+        public void Format_SqlServer_NonClusteredIndexDefinition_AddsNonClusteredDirective()
+        {
+            SqlSyntaxContext.SqlSyntaxProvider = SqlServerSyntax.Provider;
+
+            var indexDefinition = CreateIndexDefinition();
+            indexDefinition.IndexType = IndexTypes.NonClustered;
+
+            var actual = SqlSyntaxContext.SqlSyntaxProvider.Format(indexDefinition);
+            Assert.AreEqual("CREATE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", actual);
+        }
+
+        [Test]
+        public void Format_SqlServer_NonClusteredIndexDefinition_UsingIsClusteredFalse_AddsClusteredDirective()
+        {
+            SqlSyntaxContext.SqlSyntaxProvider = SqlServerSyntax.Provider;
+
+            var indexDefinition = CreateIndexDefinition();
+            indexDefinition.IsClustered = false;
+
+            var actual = SqlSyntaxContext.SqlSyntaxProvider.Format(indexDefinition);
+            Assert.AreEqual("CREATE CLUSTERED INDEX [IX_A] ON [TheTable] ([A])", actual);
+        }
+
+        [Test]
+        public void CreateIndexBuilder_SqlServer_NonClustered_CreatesNonClusteredIndex()
+        {
+            SqlSyntaxContext.SqlSyntaxProvider = SqlServerSyntax.Provider;
+            var createExpression = new CreateIndexExpression { Index = { Name = "IX_A" } };
+            var builder = new CreateIndexBuilder(createExpression);
+            builder.OnTable("TheTable").OnColumn("A").Ascending().WithOptions().NonClustered();
+            Assert.AreEqual("CREATE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", createExpression.ToString());
+        }
+
+        [Test]
+        public void CreateIndexBuilder_SqlServer_Unique_CreatesUniqueNonClusteredIndex()
+        {
+            SqlSyntaxContext.SqlSyntaxProvider = SqlServerSyntax.Provider;
+            var createExpression = new CreateIndexExpression { Index = { Name = "IX_A" } };
+            var builder = new CreateIndexBuilder(createExpression);
+            builder.OnTable("TheTable").OnColumn("A").Ascending().WithOptions().Unique();
+            Assert.AreEqual("CREATE UNIQUE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", createExpression.ToString());
+        }
+
+        [Test]
+        public void CreateIndexBuilder_SqlServer_Clustered_CreatesClusteredIndex()
+        {
+            SqlSyntaxContext.SqlSyntaxProvider = SqlServerSyntax.Provider;
+            var createExpression = new CreateIndexExpression { Index = { Name = "IX_A" } };
+            var builder = new CreateIndexBuilder(createExpression);
+            builder.OnTable("TheTable").OnColumn("A").Ascending().WithOptions().Clustered();
+            Assert.AreEqual("CREATE CLUSTERED INDEX [IX_A] ON [TheTable] ([A])", createExpression.ToString());
+        }
+
+        private static IndexDefinition CreateIndexDefinition()
+        {
+            return new IndexDefinition
+            {
+                ColumnName = "A",
+                Name = "IX_A",
+                TableName = "TheTable",
+                SchemaName = "dbo"
+            };
+        }
+
         [TearDown]
         public void TearDown()
         {