diff --git a/src/lib3270/html.c b/src/lib3270/html.c
index c79ce49..24fee0b 100644
--- a/src/lib3270/html.c
+++ b/src/lib3270/html.c
@@ -256,7 +256,26 @@
 					if(!FA_IS_PROTECTED(fa))
 					{
 						// Input field
+						char *text = lib3270_get_field_at(session,baddr+col+1);
+
 						open_input(&info,baddr+col+1);
+
+						if(text)
+						{
+							char *ptr = text;
+
+							for(ptr = text; *ptr && (*ptr == ' ' || *ptr == '_'); ptr++);
+
+							if(*ptr)
+							{
+								append_string(&info," value=\"");
+								append_string(&info,ptr);
+								append_string(&info,"\"");
+							}
+
+							lib3270_free(text);
+						}
+
 					}
 					else if(col < len && session->text[baddr+col+1].chr == 'F')
 					{
--
libgit2 0.21.2