diff --git a/src/Umbraco.Core/Persistence/Dtos/LanguageDto.cs b/src/Umbraco.Core/Persistence/Dtos/LanguageDto.cs
index f69caf6c91..25ca43f918 100644
--- a/src/Umbraco.Core/Persistence/Dtos/LanguageDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/LanguageDto.cs
@@ -46,6 +46,7 @@ namespace Umbraco.Core.Persistence.Dtos
         [Column("fallbackLanguageId")]
         [ForeignKey(typeof(LanguageDto), Column = "id")]
         [Index(IndexTypes.NonClustered)]
+        [NullSetting(NullSetting = NullSettings.Null)]
         public int? FallbackLanguageId { get; set; }
     }
 }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
index cd1fe47f39..bda899789d 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
@@ -47,6 +47,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(language.HasIdentity, Is.True);
                 Assert.That(language.CultureName, Is.EqualTo("en-US"));
                 Assert.That(language.IsoCode, Is.EqualTo("en-US"));
+                Assert.That(language.FallbackLanguage, Is.Null);
             }
         }
 
@@ -61,7 +62,8 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var au = CultureInfo.GetCultureInfo("en-AU");
                 var language = (ILanguage)new Language(au.Name)
                 {
-                    CultureName = au.DisplayName
+                    CultureName = au.DisplayName,
+                    FallbackLanguage = repository.Get(1)
                 };
                 repository.Save(language);
 
@@ -73,6 +75,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(language.HasIdentity, Is.True);
                 Assert.That(language.CultureName, Is.EqualTo(au.DisplayName));
                 Assert.That(language.IsoCode, Is.EqualTo(au.Name));
+                Assert.That(language.FallbackLanguage.IsoCode, Is.EqualTo("en-US"));
             }
         }
 
@@ -182,7 +185,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(provider);
 
                 // Act
-                var languageBR = new Language("pt-BR") {CultureName = "pt-BR"};
+                var languageBR = new Language("pt-BR") { CultureName = "pt-BR" };
                 repository.Save(languageBR);
 
                 // Assert
@@ -190,6 +193,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(languageBR.Id, Is.EqualTo(6)); //With 5 existing entries the Id should be 6
                 Assert.IsFalse(languageBR.IsDefaultVariantLanguage);
                 Assert.IsFalse(languageBR.Mandatory);
+                Assert.IsNull(languageBR.FallbackLanguage);
             }
         }
 
@@ -211,6 +215,31 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(languageBR.Id, Is.EqualTo(6)); //With 5 existing entries the Id should be 6
                 Assert.IsTrue(languageBR.IsDefaultVariantLanguage);
                 Assert.IsTrue(languageBR.Mandatory);
+                Assert.IsNull(languageBR.FallbackLanguage);
+            }
+        }
+
+        [Test]
+        public void Can_Perform_Add_On_LanguageRepository_With_Fallback_Language()
+        {
+            // Arrange
+            var provider = TestObjects.GetScopeProvider(Logger);
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+
+                // Act
+                var languageBR = new Language("pt-BR")
+                    {
+                        CultureName = "pt-BR",
+                        FallbackLanguage = repository.Get(1)
+                    };
+                repository.Save(languageBR);
+
+                // Assert
+                Assert.That(languageBR.HasIdentity, Is.True);
+                Assert.That(languageBR.Id, Is.EqualTo(6)); //With 5 existing entries the Id should be 6
+                Assert.That(languageBR.FallbackLanguage.IsoCode, Is.EqualTo("en-US"));
             }
         }
 
@@ -232,13 +261,11 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.IsTrue(languageBR.Mandatory);
 
                 // Act
-
                 var languageNZ = new Language("en-NZ") { CultureName = "en-NZ", IsDefaultVariantLanguage = true, Mandatory = true };
                 repository.Save(languageNZ);
                 languageBR = repository.Get(languageBR.Id);
 
                 // Assert
-
                 Assert.IsFalse(languageBR.IsDefaultVariantLanguage);
                 Assert.IsTrue(languageNZ.IsDefaultVariantLanguage);
             }
@@ -257,6 +284,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var language = repository.Get(5);
                 language.IsoCode = "pt-BR";
                 language.CultureName = "pt-BR";
+                language.FallbackLanguage = repository.Get(1);
 
                 repository.Save(language);
 
@@ -266,6 +294,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(languageUpdated, Is.Not.Null);
                 Assert.That(languageUpdated.IsoCode, Is.EqualTo("pt-BR"));
                 Assert.That(languageUpdated.CultureName, Is.EqualTo("pt-BR"));
+                Assert.That(languageUpdated.FallbackLanguage.IsoCode, Is.EqualTo("en-US"));
             }
         }
 
@@ -314,7 +343,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             base.TearDown();
         }
 
-        public void CreateTestData()
+        private void CreateTestData()
         {
             var languageDK = new Language("da-DK") { CultureName = "da-DK" };
             ServiceContext.LocalizationService.Save(languageDK);//Id 2
diff --git a/src/Umbraco.Web/Editors/LanguageController.cs b/src/Umbraco.Web/Editors/LanguageController.cs
index 0640d16129..9b73b50300 100644
--- a/src/Umbraco.Web/Editors/LanguageController.cs
+++ b/src/Umbraco.Web/Editors/LanguageController.cs
@@ -66,12 +66,11 @@ namespace Umbraco.Web.Editors
                 }   
                 else if (allLangs.All(x => !x.IsDefaultVariantLanguage))
                 {
-                    //if no language has the default flag, then the defaul language is the one with the lowest id
+                    //if no language has the default flag, then the default language is the one with the lowest id
                     model.IsDefaultVariantLanguage = allLangs[0].Id == lang.Id;
                     model.Mandatory = allLangs[0].Id == lang.Id;
                 }
             }
-            
 
             return model;
         }
@@ -159,7 +158,7 @@ namespace Umbraco.Web.Editors
             found.IsDefaultVariantLanguage = language.IsDefaultVariantLanguage;
             AssociateFallbackLanguage(language, found);
 
-            if (UpdatedFallbackLanguageCreatesCircularPath(found))
+            if (DoesUpdatedFallbackLanguageCreateACircularPath(found))
             {
                 ModelState.AddModelError("FallbackLanguage", "The selected fall back language '" + found.FallbackLanguage.CultureName + "' would create a circular path.");
                 throw new HttpResponseException(Request.CreateValidationErrorResponse(ModelState));
@@ -185,7 +184,7 @@ namespace Umbraco.Web.Editors
                 };
         }
 
-        private bool UpdatedFallbackLanguageCreatesCircularPath(ILanguage language)
+        private bool DoesUpdatedFallbackLanguageCreateACircularPath(ILanguage language)
         {
             if (language.FallbackLanguage == null)
             {
@@ -198,6 +197,7 @@ namespace Umbraco.Web.Editors
             {
                 if (fallbackLanguage.Id == language.Id)
                 {
+                    // We've found the current language in the path of fall back languages, so we have a circular path.
                     return true;
                 }