diff --git a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form
index 528736e18eb..dd01bb13140 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form
+++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form
@@ -156,9 +156,6 @@
                   </Border>
                 </Property>
               </Properties>
-              <AccessibilityProperties>
-                <Property name="AccessibleContext.accessibleName" type="java.lang.String" value="Battlefield"/>
-              </AccessibilityProperties>
 
               <Layout>
                 <DimensionLayout dim="0">
diff --git a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
index 32ac3c49d51..3d3fb6cc56f 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
@@ -644,6 +644,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
 		save(prefs, dialog.nonLandPermanentsInOnePile, KEY_PERMANENTS_IN_ONE_PILE, "true", "false", UPDATE_CACHE_POLICY);
 
 		// connection
+        save(prefs, dialog.cbProxyType, KEY_PROXY_TYPE);
 		save(prefs, dialog.txtProxyServer, KEY_PROXY_ADDRESS);
 		save(prefs, dialog.txtProxyPort, KEY_PROXY_PORT);
 		save(prefs, dialog.txtProxyUserName, KEY_PROXY_USERNAME);
@@ -776,6 +777,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
 
 					// connection
 					dialog.cbProxyType.setSelectedItem(Connection.ProxyType.valueOf(MageFrame.getPreferences().get(KEY_PROXY_TYPE, "NONE").toUpperCase()));
+                    
 					load(prefs, dialog.txtProxyServer, KEY_PROXY_ADDRESS, Config.serverName);
 					load(prefs, dialog.txtProxyPort, KEY_PROXY_PORT, Integer.toString(Config.port));
 					load(prefs, dialog.txtProxyUserName, KEY_PROXY_USERNAME, "");
@@ -852,6 +854,11 @@ public class PreferencesDialog extends javax.swing.JDialog {
         field.setText(prop);
     }
 
+	private static void load(Preferences prefs, JComboBox field, String propName, String defaultValue) {
+        String prop = prefs.get(propName, defaultValue);
+        field.setSelectedItem(prop);
+    }
+
     private static void load(Preferences prefs, JCheckBox checkBox, String propName) {
         load(prefs, checkBox, propName, PHASE_ON);
     }
@@ -871,6 +878,11 @@ public class PreferencesDialog extends javax.swing.JDialog {
         prefs.put(propName, textField.getText().trim());
 		updateCache(propName, textField.getText().trim());
     }
+    
+	private static void save(Preferences prefs, JComboBox comboBox, String propName) {
+        prefs.put(propName, comboBox.getSelectedItem().toString().trim());
+		updateCache(propName, comboBox.getSelectedItem().toString().trim());
+    }
 
 	public void reset() {
 		jTabbedPane1.setSelectedIndex(0);
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
index 1a2fe1dc26b..1af13de9f31 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
@@ -414,7 +414,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
 			default: p = Proxy.NO_PROXY; break;
 		}
 
-		if (!p.equals(Proxy.NO_PROXY)) {
+		if (type != Proxy.Type.DIRECT) {
 			try {
 				String address = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_PROXY_ADDRESS, "");
 				Integer port = Integer.parseInt(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_PROXY_PORT, "80"));