diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 59ae9b7340..cbe15aa626 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -701,18 +701,13 @@ namespace MediaBrowser.Server.Implementations.Library
                 throw new ArgumentNullException();
             }
 
-            var validFilename = FileSystem.GetValidFilename(name);
+            var validFilename = FileSystem.GetValidFilename(name).Trim();
 
             string subFolderPrefix = null;
 
             if (typeof(T) == typeof(Person) && ConfigurationManager.Configuration.EnablePeoplePrefixSubFolders)
             {
                 subFolderPrefix = validFilename.Substring(0, 1);
-
-                if (string.IsNullOrWhiteSpace(subFolderPrefix))
-                {
-                    subFolderPrefix = "0";
-                }
             }
 
             var key = string.IsNullOrEmpty(subFolderPrefix) ?