diff --git a/etemplate/js/et2_widget_selectAccount.js b/etemplate/js/et2_widget_selectAccount.js
index a44e883b86..b4f2de90cd 100644
--- a/etemplate/js/et2_widget_selectAccount.js
+++ b/etemplate/js/et2_widget_selectAccount.js
@@ -855,17 +855,13 @@ var et2_selectAccount_ro = et2_link_string.extend([et2_IDetachedDOM],
 			// No clicks either
 			.off();
 
-		if(this.options.select_options && this.options.select_options[_value] || this.options.empty_label)
+		if(this.options.select_options && !jQuery.isEmptyObject(this.options.select_options) || this.options.empty_label)
 		{
 			if(!_value)
 			{
 				// Empty label from selectbox
 				this.list.append("<li>"+this.options.empty_label+"</li>");
 			}
-			else if (this.options.select_options[_value])
-			{
-				this.list.append("<li>"+this.options.select_options[_value]+"</li>");
-			}
 			else if (typeof _value == 'object')
 			{
 				// An array with 0 / empty in it?
@@ -882,6 +878,32 @@ var et2_selectAccount_ro = et2_link_string.extend([et2_IDetachedDOM],
 					}
 				}
 			}
+			else
+			{
+				// Options are not indexed, so we must look
+				var search = _value;
+				if (!jQuery.isArray(search))
+				{
+					search = [_value];
+				}
+				for(var j = 0; j < search.length; j++)
+				{
+					var found = false;
+
+					// Not having a value to look up causes an infinite loop
+					if(!search[j]) continue;
+
+					for(var i in this.options.select_options)
+					{
+						if(this.options.select_options[i].value == search[j])
+						{
+							this.list.append("<li>"+this.options.select_options[i].label+"</li>");
+							break;
+						}
+					}
+
+				}
+			}
 		}
 	}
 });