diff --git a/src/pw3270/actions.c b/src/pw3270/actions.c
index 255040d..bdea1c9 100644
--- a/src/pw3270/actions.c
+++ b/src/pw3270/actions.c
@@ -73,6 +73,7 @@ static void connect_action(GtkAction *action, GtkWidget *widget)
 
 	if(host)
 	{
+		lib3270_set_options(v3270_get_session(widget),0);
 		v3270_connect(widget,host);
 		return;
 	}
@@ -80,6 +81,7 @@ static void connect_action(GtkAction *action, GtkWidget *widget)
 	host = get_string_from_config("host","uri","");
 	if(*host)
 	{
+		load_3270_options_from_config(widget);
 		v3270_connect(widget,host);
 		g_free(host);
 		return;
diff --git a/src/pw3270/dialog.c b/src/pw3270/dialog.c
index e38fa64..f6eb271 100644
--- a/src/pw3270/dialog.c
+++ b/src/pw3270/dialog.c
@@ -32,7 +32,46 @@
  #include "globals.h"
  #include <pw3270/v3270.h>
 
-/*--[ Implement ]------------------------------------------------------------------------------------*/
+ static const struct _lib3270_options
+ {
+	LIB3270_OPTION	  value;
+	const gchar		* key;
+	const gchar		* text;
+	const gchar		* tooltip;
+ } lib3270_options[] =
+ {
+	{
+		LIB3270_OPTION_COLOR8,
+		"color8",
+		N_( "_8 colors" ),
+		N_( "If active, pw3270 will respond to a Query(Color) with a list of 8 supported colors." )
+	},
+
+	{
+		LIB3270_OPTION_AS400,
+		"as400",
+		N_( "Host is AS_400" ),
+		NULL
+	},
+
+ };
+
+
+/*--[ Globals ]--------------------------------------------------------------------------------------*/
+
+ void load_3270_options_from_config(GtkWidget *widget)
+ {
+ 	int f;
+	LIB3270_OPTION opt = 0;
+
+	for(f=0;f<G_N_ELEMENTS(lib3270_options);f++)
+	{
+		if(get_boolean_from_config("host",lib3270_options[f].key,FALSE))
+			opt |= lib3270_options[f].value;
+	}
+	lib3270_set_options(v3270_get_session(widget),opt);
+ }
+
 
  static void charset_changed(GtkComboBox *widget,gchar **encoding)
  {
@@ -286,28 +325,9 @@
 	return 0;
  }
 
+
  void hostname_action(GtkAction *action, GtkWidget *widget)
  {
- 	static const struct _option
-	{
-		LIB3270_OPTION	  value;
-		const gchar		* text;
-		const gchar		* tooltip;
-	} option[] =
-	{
-		{
-			LIB3270_OPTION_COLOR8,
-			N_( "_8 colors" ),
-			N_( "If active, pw3270 will respond to a Query(Color) with a list of 8 supported colors." )
-		},
-
-		{
-			LIB3270_OPTION_AS400,
-			N_( "Host is AS_400" ),
-			NULL
-		},
-	};
-
  	const gchar 	* title 	= g_object_get_data(G_OBJECT(action),"title");
  	gchar			* cfghost	= get_string_from_config("host","uri","");
  	gchar			* hostname;
@@ -318,7 +338,7 @@
  	GtkEntry		* host		= GTK_ENTRY(gtk_entry_new());
  	GtkEntry		* port		= GTK_ENTRY(gtk_entry_new());
  	GtkToggleButton	* sslcheck	= GTK_TOGGLE_BUTTON(gtk_check_button_new_with_mnemonic( _( "_Secure connection" ) ));
- 	GtkToggleButton	* optcheck[G_N_ELEMENTS(option)];
+ 	GtkToggleButton	* optcheck[G_N_ELEMENTS(lib3270_options)];
  	GtkWidget 		* dialog 	= gtk_dialog_new_with_buttons(	gettext(title ? title : N_( "Select hostname" )),
 																GTK_WINDOW(gtk_widget_get_toplevel(widget)),
 																GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -347,20 +367,19 @@
 		int f;
 		int col = 1;
 		int row = 0;
-		LIB3270_OPTION optval = lib3270_get_options(v3270_get_session(widget));
 
 		GtkTable * frame = GTK_TABLE(gtk_table_new(2,2,FALSE));
 		gtk_table_attach(frame,GTK_WIDGET(sslcheck), 0,1,0,1,GTK_EXPAND|GTK_FILL,0,0,0);
 
-		for(f=0;f<G_N_ELEMENTS(option);f++)
+		for(f=0;f<G_N_ELEMENTS(lib3270_options);f++)
 		{
-			optcheck[f] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_mnemonic( gettext( option[f].text ) ));
+			optcheck[f] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_mnemonic( gettext( lib3270_options[f].text ) ));
 
-			if(option[f].tooltip)
-				gtk_widget_set_tooltip_markup(GTK_WIDGET(optcheck[f]),gettext(option[f].tooltip));
+			if(lib3270_options[f].tooltip)
+				gtk_widget_set_tooltip_markup(GTK_WIDGET(optcheck[f]),gettext(lib3270_options[f].tooltip));
 
 			gtk_table_attach(frame,GTK_WIDGET(optcheck[f]),col,col+1,row,row+1,GTK_EXPAND|GTK_FILL,0,0,0);
-			gtk_toggle_button_set_active(optcheck[f],optval & option[f].value ? TRUE : FALSE);
+			gtk_toggle_button_set_active(optcheck[f],get_boolean_from_config("host", lib3270_options[f].key, FALSE));
 
 			if(++col > 1);
 			{
@@ -423,6 +442,22 @@
 									NULL
 								);
 
+			{
+				int f;
+				LIB3270_OPTION opt = 0;
+
+				for(f=0;f<G_N_ELEMENTS(lib3270_options);f++)
+				{
+					gboolean val = gtk_toggle_button_get_active(optcheck[f]);
+					if(val)
+						opt |= lib3270_options[f].value;
+					set_boolean_to_config("host", lib3270_options[f].key, val);
+				}
+
+				lib3270_set_options(v3270_get_session(widget),opt);
+
+			}
+
 			if(!lib3270_connect(v3270_get_session(widget),hostname,1))
 				again = FALSE;
 
diff --git a/src/pw3270/globals.h b/src/pw3270/globals.h
index 48fa171..f8c76bf 100644
--- a/src/pw3270/globals.h
+++ b/src/pw3270/globals.h
@@ -62,6 +62,9 @@
  G_GNUC_INTERNAL void		  load_color_schemes(GtkWidget *widget, gchar *active);
  G_GNUC_INTERNAL GtkWidget	* color_scheme_new(const GdkColor *current);
 
+ G_GNUC_INTERNAL void		  load_3270_options_from_config(GtkWidget *widget);
+
+
  // actions
  G_GNUC_INTERNAL void paste_file_action(GtkAction *action, GtkWidget *widget);
  G_GNUC_INTERNAL void hostname_action(GtkAction *action, GtkWidget *widget);
--
libgit2 0.21.2