diff --git a/MacPass/Kdb4Entry+MPAdditions.m b/MacPass/Kdb4Entry+MPAdditions.m
index d42631ba..cfc696ce 100644
--- a/MacPass/Kdb4Entry+MPAdditions.m
+++ b/MacPass/Kdb4Entry+MPAdditions.m
@@ -11,9 +11,11 @@
 @implementation Kdb4Entry (MPAdditions)
 
 - (NSString *)uniqueKeyForProposal:(NSString *)key {
-  /*
-   FIXME: Introduce some cachin behaviour. We iterate over after every single edit
-   */
+
+  if(key == nil) {
+    key = NSLocalizedString(@"DEFAULT_CUSTOM_FIELD_TITLE", @"Default Titel for new Custom-Fields");
+  }
+  
   NSArray *defaultKeys = @[ FIELD_TITLE,
                             FIELD_USER_NAME,
                             FIELD_PASSWORD,