diff --git a/extensions/wallet/signonviewer/SignonViewer.js b/extensions/wallet/signonviewer/SignonViewer.js
index 8660947983aa..4a35ab1e1965 100644
--- a/extensions/wallet/signonviewer/SignonViewer.js
+++ b/extensions/wallet/signonviewer/SignonViewer.js
@@ -106,7 +106,11 @@ function LoadSignons()
         Components.classes["component://netscape/network/standard-url"]
           .createInstance(Components.interfaces.nsIURI); 
       uri.spec = site; 
-      user = uri.username;
+      if (user.username) {
+        user = uri.username;
+      } else {
+        user = "<>";
+      }
     }
     AddItem("savesignonlist",[site,user],"signon_",i-1);
   }
diff --git a/xpfe/global/resources/content/selectDialog.js b/xpfe/global/resources/content/selectDialog.js
index 8c79140fc0ef..83601eb6b8f5 100644
--- a/xpfe/global/resources/content/selectDialog.js
+++ b/xpfe/global/resources/content/selectDialog.js
@@ -73,6 +73,9 @@ function selectDialogOnLoad() {
 
   for ( i = 2; i <= numItems+1; i++ ) {
     var newString = param.GetString( i );
+    if (newString == "") {
+      newString = "<>";
+    }
     dump("setting string "+newString+"\n");
     elements[i-2] = AppendStringToTreelist(list, newString);
   }