diff --git a/android/res/raw/jsmain.js b/android/res/raw/jsmain.js
index 0196684..9046c1b 100644
--- a/android/res/raw/jsmain.js
+++ b/android/res/raw/jsmain.js
@@ -19,12 +19,15 @@ function xmit()
 {
 	var form = document.getElementById("form3270");
 
-	for(var i=0;i < form.elements.length;i++)
+	if(form != undefined)
 	{
-		if(form.elements[i].name.substr(0,1) == "F")
+		for(var i=0;i < form.elements.length;i++)
 		{
-			var offset = parseInt(form.elements[i].name.substr(1,4));
-			pw3270.setStringAt(offset,form.elements[i].value);
+			if(form.elements[i].name.substr(0,1) == "F")
+			{
+				var offset = parseInt(form.elements[i].name.substr(1),10);
+				pw3270.setStringAt(offset,form.elements[i].value);
+			}
 		}
 	}
 	
diff --git a/src/lib3270/html.c b/src/lib3270/html.c
index b3aefda..73f398b 100644
--- a/src/lib3270/html.c
+++ b/src/lib3270/html.c
@@ -317,7 +317,9 @@
 									append_string(&info,"\" value=\"");
 									append_string(&info,ptr);
 									append_string(&info,"\"");
-									info.mode = HTML_MODE_INPUT_BUTTON;
+									info.mode  = HTML_MODE_INPUT_BUTTON;
+									info.input = info.text+strlen(info.text);
+
 								}
 							}
 							lib3270_free(text);
--
libgit2 0.21.2