diff --git a/Frameworks/Ajax/ERJQMobile/Components/Nonlocalized.lproj/ERQMAutoComplete.wo/ERQMAutoComplete.html b/Frameworks/Ajax/ERJQMobile/Components/Nonlocalized.lproj/ERQMAutoComplete.wo/ERQMAutoComplete.html
index a9bdf66a8e2..7c29da61c9a 100644
--- a/Frameworks/Ajax/ERJQMobile/Components/Nonlocalized.lproj/ERQMAutoComplete.wo/ERQMAutoComplete.html
+++ b/Frameworks/Ajax/ERJQMobile/Components/Nonlocalized.lproj/ERQMAutoComplete.wo/ERQMAutoComplete.html
@@ -13,10 +13,14 @@
 <wo:if condition = "$hasHiddenValue"> <wo:WOHiddenField value = "$^valueHidden" id = "$hiddenValueId" /> </wo:if>
 <script>
   $( document ).on( "pageshow", function(event, ui){
+  		<wo:if condition="$hasLocalValues">var data = [<wo:str value = "$localValuesAsString" />];</wo:if>
         $('#<wo:str value = "$javaScriptElementID" />').autocomplete({
         target: $('#<wo:str value = "$listID" />'),
-      <wo:if condition = "$jsonDirectActionName">source: '<webobject name = "JsonDirectActionSource" />',</wo:if>
-      <wo:else>source: '<webobject name = "JsonActionSource" />',</wo:else>
+      <wo:if condition="$hasLocalValues">source: data,<wo:not condition="$localMatchFromStart">matchFromStart: false, </wo:not></wo:if>
+      <wo:else>
+        <wo:if condition = "$jsonDirectActionName">source: '<webobject name = "JsonDirectActionSource" />',</wo:if>
+        <wo:else>source: '<webobject name = "JsonActionSource" />',</wo:else>
+      </wo:else>
       	minLength: <wo:str value = "$minLength" />,
         callback: function(e) {
         var $a = $(e.currentTarget);
diff --git a/Frameworks/Ajax/ERJQMobile/Sources/er/jqm/components/core/ERQMAutoComplete.java b/Frameworks/Ajax/ERJQMobile/Sources/er/jqm/components/core/ERQMAutoComplete.java
index f989ba122c8..2e6e2455567 100644
--- a/Frameworks/Ajax/ERJQMobile/Sources/er/jqm/components/core/ERQMAutoComplete.java
+++ b/Frameworks/Ajax/ERJQMobile/Sources/er/jqm/components/core/ERQMAutoComplete.java
@@ -1,6 +1,7 @@
 package er.jqm.components.core;
 
 import com.webobjects.appserver.WOContext;
+import com.webobjects.foundation.NSArray;
 import com.webobjects.foundation.NSDictionary;
 import com.webobjects.foundation.NSMutableDictionary;
 
@@ -12,6 +13,9 @@
  * class
  * value
  * 
+ * localValues
+ * localMatchFromStart <strong>true</strong> | false
+ * 
  * data-corners	<strong>true</strong> | false
  * data-clear-btn	true | <strong>false</strong> - Adds a clear button
  * data-clear-btn-text	string - Text for the close button. Default: "<strong>clear text</strong>"
@@ -71,6 +75,47 @@ public String hiddenValueId()
 		return "h_" + javaScriptElementID();
 	}
 
+	public boolean hasLocalValues()
+	{
+		return hasBinding("localValues");
+	}
+
+	public String localValuesAsString()
+	{
+		String result = null;
+		Object obj = _objectValueForBinding("localValues", null, null);
+		if (obj != null)
+		{
+			if (obj instanceof String)
+			{
+				result = (String) obj;
+			}
+			else if (obj instanceof NSArray)
+			{
+				@SuppressWarnings("unchecked")
+				NSArray<Object> array = (NSArray<Object>) obj;
+				StringBuffer buf = new StringBuffer();
+				for (int i = 0; i < array.count(); i++)
+				{
+					if (i > 0)
+					{
+						buf.append(", ");
+					}
+					buf.append("'");
+					buf.append(array.get(i).toString());
+					buf.append("'");
+				}
+				result = buf.toString();
+			}
+		}
+		return result;
+	}
+
+	public boolean localMatchFromStart()
+	{
+		return booleanValueForBinding("localMatchFromStart", true);
+	}
+
 	public String jsonActionClass()
 	{
 		return stringValueForBinding("jsonActionClass");