Merge commit 'e914892d83631c329f8f496c8db3c6e9b9bc3e47' into frank

inabox.wpf/DynamicGrid/DynamicGridCustomColumnsComponent.cs

@@ -37,9 +37,6 @@ public class DynamicGridCustomColumnsComponent<T>
 
         var columns = user.Result.Any() ? user.Result : global.Result;
 
-        if (!columns.Any())
-            columns = Grid.GenerateColumns();
-
         columns.RemoveAll(x =>
         {
             if (x.ColumnName.IsNullOrWhiteSpace()) return true;
@@ -51,6 +48,11 @@ public class DynamicGridCustomColumnsComponent<T>
             return false;
         });
 
+        if (!columns.Any())
+        {
+            columns = Grid.GenerateColumns();
+        }
+
         return columns;
     }