diff --git a/mRemoteV1/Connection/Protocol/PuttyBase.cs b/mRemoteV1/Connection/Protocol/PuttyBase.cs
index bb5afa516..20664b148 100644
--- a/mRemoteV1/Connection/Protocol/PuttyBase.cs
+++ b/mRemoteV1/Connection/Protocol/PuttyBase.cs
@@ -80,7 +80,7 @@ namespace mRemoteNG.Connection.Protocol
 							}
 							else if (Settings.Default.EmptyCredentials == "custom")
 							{
-								username = Convert.ToString(Settings.Default.DefaultUsername);
+								username = Settings.Default.DefaultUsername;
 							}
 						}
 								
@@ -93,7 +93,7 @@ namespace mRemoteNG.Connection.Protocol
 							if (Settings.Default.EmptyCredentials == "custom")
 							{
                                 var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-                                password = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.DefaultPassword), Runtime.EncryptionKey);
+                                password = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey);
 							}
 						}
 								
diff --git a/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs b/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs
index a7d85433f..38bc988bc 100644
--- a/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs
+++ b/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs
@@ -428,7 +428,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
 					}
 					else if (Settings.Default.EmptyCredentials == "custom")
 					{
-						_rdpClient.UserName = Convert.ToString(Settings.Default.DefaultUsername);
+						_rdpClient.UserName = Settings.Default.DefaultUsername;
 					}
 				}
 				else
@@ -443,7 +443,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
 						if (Settings.Default.DefaultPassword != "")
 						{
                             var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-                            _rdpClient.AdvancedSettings2.ClearTextPassword = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.DefaultPassword), Runtime.EncryptionKey);
+                            _rdpClient.AdvancedSettings2.ClearTextPassword = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey);
 						}
 					}
 				}
@@ -460,7 +460,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
 					}
 					else if (Settings.Default.EmptyCredentials == "custom")
 					{
-						_rdpClient.Domain = Convert.ToString(Settings.Default.DefaultDomain);
+						_rdpClient.Domain = Settings.Default.DefaultDomain;
 					}
 				}
 				else
diff --git a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
index babb70ae1..3c6d11f95 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
@@ -78,10 +78,10 @@ namespace mRemoteNG.UI.Forms.OptionsPages
                 radCredentialsCustom.Checked = true;
             }
 
-            txtCredentialsUsername.Text = Convert.ToString(Settings.Default.DefaultUsername);
+            txtCredentialsUsername.Text = Settings.Default.DefaultUsername;
             var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-            txtCredentialsPassword.Text = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.DefaultPassword), Runtime.EncryptionKey);
-            txtCredentialsDomain.Text = Convert.ToString(Settings.Default.DefaultDomain);
+            txtCredentialsPassword.Text = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey);
+            txtCredentialsDomain.Text = Settings.Default.DefaultDomain;
 
             if (Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Never)
             {