diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index 095759eea9..f3b2536cc1 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -222,7 +222,7 @@ namespace Umbraco.Core.IO
             {
                 foreach (var character in Path.GetInvalidFileNameChars())
                 {
-                    filePath = filePath.Replace(character, '_');
+                    filePath = filePath.Replace(character, '-');
                 }
             }
             else
@@ -242,10 +242,14 @@ namespace Umbraco.Core.IO
                 if (reservedCharacters.IndexOf(character) == -1)
                     stringBuilder.Append(character);
                 else
-                    stringBuilder.Append("_");
+                    stringBuilder.Append("-");
             }
 
-            return stringBuilder.ToString();
+            // Remove repeating dashes
+            // From: http://stackoverflow.com/questions/5111967/regex-to-remove-a-specific-repeated-character
+            var reducedString = Regex.Replace(stringBuilder.ToString(), "-+", "-");
+
+            return reducedString;
         }
     }
 }