diff --git a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
index 6abaf54f9..5b4224e09 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
@@ -104,7 +104,6 @@ public void removeBookmark(WeblogBookmark bookmark) throws WebloggerException {
 
     @Override
     public void saveFolder(WeblogBookmarkFolder folder) throws WebloggerException {
-        folder.sanitize();
 
         // If new folder make sure name is unique
         if ((folder.getId() == null || this.getFolder(folder.getId()) == null) && isDuplicateFolderName(folder)) {
@@ -150,7 +149,6 @@ public void importBookmarks(
             WeblogBookmarkFolder newFolder = getFolder(website, folderName);
             if (newFolder == null) {
                 newFolder = new WeblogBookmarkFolder(folderName, website);
-                newFolder.sanitize();
                 this.strategy.store(newFolder);
             }
 
@@ -212,7 +210,6 @@ private void importOpmlElement(
                         url,
                         xmlUrl,
                         null);
-                bd.sanitize();
                 folder.addBookmark(bd);
                 this.strategy.store(bd);
             }
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
index 0bfa3b718..d83bac426 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
@@ -68,7 +68,6 @@ public void release() {}
  
     @Override
     public void saveUser(User user) throws WebloggerException {
-        user.sanitize();
         this.strategy.store(user);
     }
 
@@ -114,7 +113,6 @@ public void addUser(User newUser) throws WebloggerException {
             throw new WebloggerException("error.add.user.userNameInUse");
         }
 
-        newUser.sanitize();
         this.strategy.store(newUser);
 
         grantRole("editor", newUser);
diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/User.java b/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
index 0904e9ef5..2898044e7 100644
--- a/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
+++ b/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
@@ -241,11 +241,6 @@ public boolean hasGlobalPermissions(List<String> actions) {
         }
     }
 
-    public void sanitize() {
-        setFullName(HTMLSanitizer.conditionallySanitize(getFullName()));
-        setScreenName(HTMLSanitizer.conditionallySanitize(getScreenName()));
-    }
-    
     //------------------------------------------------------- Good citizenship
     
     @Override
diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
index 733a7a887..717082033 100644
--- a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
+++ b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
@@ -94,7 +94,7 @@ public String getName() {
     }
     
     public void setName(String name) {
-        this.name = name;
+        this.name =  HTMLSanitizer.conditionallySanitize(name);
     }
     
     /**
@@ -105,7 +105,7 @@ public String getDescription() {
     }
     
     public void setDescription(String description) {
-        this.description = description;
+        this.description =  HTMLSanitizer.conditionallySanitize(description);
     }
     
     /**
@@ -146,12 +146,6 @@ public void setFeedUrl(String feedUrl) {
         this.feedUrl = feedUrl;
     }
 
-    public void sanitize() {
-        // Conditionally sanitize fields not validated by Struts Validator
-        setName(HTMLSanitizer.conditionallySanitize(this.name));
-        setDescription(this.description == null ? "" : HTMLSanitizer.conditionallySanitize(this.description));
-    }
-    
     //---------------------------------------------------------- Relationships
 
     public org.apache.roller.weblogger.pojos.WeblogBookmarkFolder getFolder() {
diff --git a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
index 5d35fad7d..84033c289 100644
--- a/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
+++ b/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
@@ -133,7 +133,7 @@ public String getName() {
     }
     
     public void setName(String name) {
-        this.name = name;
+        this.name = HTMLSanitizer.conditionallySanitize(name);
     }
     
     /**
@@ -188,10 +188,4 @@ public List<WeblogBookmark> retrieveBookmarks() throws WebloggerException {
         BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
         return bmgr.getBookmarks(this);
     }
-
-    public void sanitize() {
-        // Conditionally sanitize fields not validated by Struts Validator
-        setName(HTMLSanitizer.conditionallySanitize(getName()));
-    }
-
 }