diff --git a/htroot/CrawlProfileEditor_p.html b/htroot/CrawlProfileEditor_p.html
index 226857b8d..1c8ca6c40 100644
--- a/htroot/CrawlProfileEditor_p.html
+++ b/htroot/CrawlProfileEditor_p.html
@@ -78,6 +78,11 @@
   </tr>
   #{/crawlProfiles}# 
 </table>
+#(existPassiveCrawls)#::
+<form action="CrawlProfileEditor_p.html" method="post" enctype="multipart/form-data">
+<input type="submit" name="deleteTerminatedProfiles" value="Delete finished crawls" />
+</form>
+#(/existPassiveCrawls)#
 </fieldset>
 
 
diff --git a/htroot/CrawlProfileEditor_p.java b/htroot/CrawlProfileEditor_p.java
index 7b61f6973..178499760 100644
--- a/htroot/CrawlProfileEditor_p.java
+++ b/htroot/CrawlProfileEditor_p.java
@@ -96,6 +96,14 @@ public class CrawlProfileEditor_p {
                 // deletion of a terminated crawl profile
                 sb.profilesPassiveCrawls.removeEntry(handle);
             }
+            if (post.containsKey("deleteTerminatedProfiles")) {
+                Iterator profiles = sb.profilesPassiveCrawls.profiles(false);
+                while (profiles.hasNext()) {
+                    profiles.next();
+                    profiles.remove();
+                    profiles = sb.profilesPassiveCrawls.profiles(false);
+                }
+            }
         }
         
         // generate handle list
@@ -151,15 +159,23 @@ public class CrawlProfileEditor_p {
             count++;
         }
         // put passive crawls into list
+        boolean existPassiveCrawls = false;
         it = sb.profilesPassiveCrawls.profiles(true);
         while (it.hasNext()) {
             profile = (plasmaCrawlProfile.entry) it.next();
             putProfileEntry(prop, profile, false, dark, count, domlistlength);
             dark = !dark;
             count++;
+            existPassiveCrawls = true;
         }
         prop.put("crawlProfiles", count);
         
+        if(existPassiveCrawls) {
+            prop.put("existPassiveCrawls", "1");
+        } else {
+            prop.put("existPassiveCrawls", "0");
+        }
+        
         // generate edit field
         if (selentry == null) {
         	prop.put("edit", "0");