diff --git a/security/nss/lib/softoken/dbinit.c b/security/nss/lib/softoken/dbinit.c
index 275be90357d..183e6afb569 100644
--- a/security/nss/lib/softoken/dbinit.c
+++ b/security/nss/lib/softoken/dbinit.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: dbinit.c,v 1.25 2005-03-29 18:21:18 nelsonb%netscape.com Exp $ */
+/* $Id: dbinit.c,v 1.26 2005-06-20 23:11:25 relyea%netscape.com Exp $ */
 
 #include <ctype.h>
 #include "seccomon.h"
@@ -49,6 +49,8 @@
 #include "cdbhdl.h"
 #include "pkcs11i.h"
 
+#define ALWAYS_MULTIACCESS "CommonClient"
+
 static char *
 sftk_certdb_name_cb(void *arg, int dbVersion)
 {
@@ -121,6 +123,9 @@ sftk_keydb_name_cb(void *arg, int dbVersion)
 const char *
 sftk_EvaluateConfigDir(const char *configdir,char **appName)
 {
+#ifdef ALWAYS_MULTIACCESS
+    *appName = PORT_Strdup(ALWAYS_MULTIACCESS);
+#else
     if (PORT_Strncmp(configdir, MULTIACCESS, sizeof(MULTIACCESS)-1) == 0) {
 	char *cdir;
 
@@ -138,6 +143,7 @@ sftk_EvaluateConfigDir(const char *configdir,char **appName)
 	}
 	configdir = cdir;
     }
+#endif
     return configdir;
 }