diff --git a/TGS.CommandLine/Program.cs b/TGS.CommandLine/Program.cs
index 262c2a4031..0e2986d944 100644
--- a/TGS.CommandLine/Program.cs
+++ b/TGS.CommandLine/Program.cs
@@ -52,7 +52,7 @@ namespace TGS.CommandLine
 					}
 					argsAsList.RemoveAt(I);
 					argsAsList.RemoveAt(I);
-					ReplaceInterface(new ServerInterface(address, port, username, password));
+					ReplaceInterface(new ServerInterface(new RemoteLoginInfo(address, port, username, password)));
 					break;
 				}
 			}
@@ -230,7 +230,7 @@ namespace TGS.CommandLine
 						var username = Console.ReadLine();
 						Console.Write("Enter password: ");
 						var password = ReadLineSecure();
-						ReplaceInterface(new ServerInterface(address, port, username, password));
+						ReplaceInterface(new ServerInterface(new RemoteLoginInfo(address, port, username, password)));
 						var res = currentInterface.ConnectionStatus(out string error);
 						if (!res.HasFlag(ConnectivityLevel.Connected))
 						{
diff --git a/TGS.ControlPanel/ControlPanel/ControlPanel.cs b/TGS.ControlPanel/ControlPanel/ControlPanel.cs
index a6d66c86a3..5ebbf73f1b 100644
--- a/TGS.ControlPanel/ControlPanel/ControlPanel.cs
+++ b/TGS.ControlPanel/ControlPanel/ControlPanel.cs
@@ -32,7 +32,7 @@ namespace TGS.ControlPanel
 			FormClosed += ControlPanel_FormClosed;
 			Interface = I;
 			if (Interface.IsRemoteConnection)
-				Text = String.Format("TGS {0}: {1}:{2}", Interface.ServerVersion, Interface.HTTPSURL, Interface.HTTPSPort);
+				Text = String.Format("TGS {0}: {1}:{2}", Interface.ServerVersion, Interface.LoginInfo.IP, Interface.LoginInfo.Port);
 			Text = String.Format("{0} Instance: {1}", Text, I.InstanceName);
 			Panels.SelectedIndexChanged += Panels_SelectedIndexChanged;
 			Panels.SelectedIndex += Math.Min(Properties.Settings.Default.LastPageIndex, Panels.TabCount - 1);
diff --git a/TGS.ControlPanel/InstanceSelector.cs b/TGS.ControlPanel/InstanceSelector.cs
index 504b2218b9..0d8a606d74 100644
--- a/TGS.ControlPanel/InstanceSelector.cs
+++ b/TGS.ControlPanel/InstanceSelector.cs
@@ -100,7 +100,7 @@ namespace TGS.ControlPanel
 				activeCP.BringToFront();
 				return;
 			}
-			var InstanceAccessor = new ServerInterface(masterInterface as ServerInterface);
+			var InstanceAccessor = new ServerInterface(masterInterface.LoginInfo);
 			try
 			{
 				ConnectivityLevel res = ConnectivityLevel.None;
diff --git a/TGS.ControlPanel/Login.cs b/TGS.ControlPanel/Login.cs
index 8b03af0ee1..4708c515bf 100644
--- a/TGS.ControlPanel/Login.cs
+++ b/TGS.ControlPanel/Login.cs
@@ -31,7 +31,7 @@ namespace TGS.ControlPanel
 		{
 			IPTextBox.Text = IPTextBox.Text.Trim();
 			UsernameTextBox.Text = UsernameTextBox.Text.Trim();
-			using (var I = new ServerInterface(IPTextBox.Text, (ushort)PortSelector.Value, UsernameTextBox.Text, PasswordTextBox.Text))
+			using (var I = new ServerInterface(new RemoteLoginInfo(IPTextBox.Text, (ushort)PortSelector.Value, UsernameTextBox.Text, PasswordTextBox.Text)))
 			{
 				var Config = Properties.Settings.Default;
 				Config.RemoteIP = IPTextBox.Text;
diff --git a/TGS.Interface/RemoteLoginInfo.cs b/TGS.Interface/RemoteLoginInfo.cs
new file mode 100644
index 0000000000..c161a124cb
--- /dev/null
+++ b/TGS.Interface/RemoteLoginInfo.cs
@@ -0,0 +1,60 @@
+using System;
+
+namespace TGS.Interface
+{
+	/// <summary>
+	/// Information representing a remote server connection
+	/// </summary>
+	[Serializable]
+	public sealed class RemoteLoginInfo
+	{
+		/// <summary>
+		/// The IP address or URL of the target server
+		/// </summary>
+		public string IP { get; }
+		/// <summary>
+		/// The port to connect to the target server
+		/// </summary>
+		public ushort Port { get; }
+		/// <summary>
+		/// A Windows username for the target server
+		/// </summary>
+		public string Username { get; }
+		/// <summary>
+		/// The Windows password for <see cref="Username"/>
+		/// </summary>
+		internal string Password { get; }
+
+		/// <summary>
+		/// Backing field for <see cref="IP"/>
+		/// </summary>
+		readonly string _ip;
+		/// <summary>
+		/// Backing field for <see cref="Port"/>
+		/// </summary>
+		readonly ushort _port;
+		/// <summary>
+		/// Backing field for <see cref="Username"/>
+		/// </summary>
+		readonly string _username;
+		/// <summary>
+		/// Backing field for <see cref="Password"/>
+		/// </summary>
+		readonly string _password;
+
+		/// <summary>
+		/// Construct a <see cref="RemoteLoginInfo"/>
+		/// </summary>
+		/// <param name="ip">The value for <see cref="IP"/></param>
+		/// <param name="port">The value for <see cref="Port"/></param>
+		/// <param name="username">The value for <see cref="Username"/></param>
+		/// <param name="password">The value for <see cref="Password"/></param>
+		public RemoteLoginInfo(string ip, ushort port, string username, string password)
+		{
+			_ip = ip;
+			_port = port;
+			_username = username;
+			_password = password;
+		}
+	}
+}
diff --git a/TGS.Interface/ServerInterface.cs b/TGS.Interface/ServerInterface.cs
index 833b9c5574..3fa5c99bb9 100644
--- a/TGS.Interface/ServerInterface.cs
+++ b/TGS.Interface/ServerInterface.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Net.Security;
@@ -27,14 +26,9 @@ namespace TGS.Interface
 		string InstanceName { get; }
 
 		/// <summary>
-		/// If this is set, we will try and connect to an HTTPS server running at this address
+		/// The <see cref="RemoteLoginInfo"/> for the <see cref="IServerInterface"/>. Is <see langword="null"/> for local connections
 		/// </summary>
-		string HTTPSURL { get; }
-
-		/// <summary>
-		/// The port used to connect to the <see cref="ITGSService"/>
-		/// </summary>
-		ushort HTTPSPort { get; }
+		RemoteLoginInfo LoginInfo { get; }
 
 		/// <summary>
 		/// Checks if the <see cref="IServerInterface"/> is setup for a remote connection
@@ -151,30 +145,12 @@ namespace TGS.Interface
 		public string InstanceName { get; private set; }
 
 		/// <summary>
-		/// If this is set, we will try and connect to an HTTPS server running at this address
+		/// Backing field for <see cref="LoginInfo"/>
 		/// </summary>
-		readonly string _HTTPSURL;
+		readonly RemoteLoginInfo _loginInfo;
 
 		/// <inheritdoc />
-		public string HTTPSURL { get { return _HTTPSURL; } }
-
-		/// <summary>
-		/// The port used to connect to the <see cref="ITGSService"/>
-		/// </summary>
-		readonly ushort _HTTPSPort;
-
-		/// <inheritdoc />
-		public ushort HTTPSPort { get { return _HTTPSPort; } }
-
-		/// <summary>
-		/// Username for remote operations
-		/// </summary>
-		readonly string HTTPSUsername;
-
-		/// <summary>
-		/// Password for remote operations
-		/// </summary>
-		readonly string HTTPSPassword;
+		public RemoteLoginInfo LoginInfo { get { return _loginInfo; } }
 
 		/// <summary>
 		/// Associated list of open <see cref="ChannelFactory"/>s keyed by <see langword="interface"/> type name. A <see cref="ChannelFactory"/> in this list may close or fault at any time. Must be locked before being accessed
@@ -237,24 +213,12 @@ namespace TGS.Interface
 		/// <summary>
 		/// Construct an <see cref="ServerInterface"/> for a remote connection
 		/// </summary>
-		/// <param name="address">The address of the remote server</param>
-		/// <param name="port">The port the remote server runs on</param>
-		/// <param name="username">Windows account username for the remote server</param>
-		/// <param name="password">Windows account password for the remote server</param>
-		public ServerInterface(string address, ushort port, string username, string password)
+		/// <param name="loginInfo">The <see cref="RemoteLoginInfo"/> for a remote connection</param>
+		public ServerInterface(RemoteLoginInfo loginInfo)
 		{
-			_HTTPSURL = address;
-			_HTTPSPort = port;
-			HTTPSUsername = username;
-			HTTPSPassword = password;
+			_loginInfo = loginInfo;
 		}
 
-		/// <summary>
-		/// Constructs an <see cref="ServerInterface"/> that connects to the same <see cref="ITGSService"/> as some <paramref name="other"/> <see cref="ITGInstance"/>
-		/// </summary>
-		/// <param name="other">Another <see cref="ServerInterface"/> to copy settings from</param>
-		public ServerInterface(ServerInterface other) : this(other.HTTPSURL, other.HTTPSPort, other.HTTPSUsername, other.HTTPSPassword) { }
-
 		/// <inheritdoc />
 		public ConnectivityLevel ConnectToInstance(string instanceName = null, bool skipChecks = false)
 		{
@@ -297,7 +261,7 @@ namespace TGS.Interface
 		}
 
 		/// <inheritdoc />
-		public bool IsRemoteConnection { get { return HTTPSURL != null; } }
+		public bool IsRemoteConnection { get { return LoginInfo != null; } }
 
 		/// <summary>
 		/// Closes all <see cref="ChannelFactory"/>s stored in <see cref="ChannelFactoryCache"/> and clears it
@@ -436,12 +400,12 @@ namespace TGS.Interface
 			binding.Security.Transport.ClientCredentialType = HttpClientCredentialType.None;
 			binding.Security.Mode = requireAuth ? SecurityMode.TransportWithMessageCredential : SecurityMode.Transport;    //do not require auth for a connectivity check
 			binding.Security.Message.ClientCredentialType = requireAuth ? MessageCredentialType.UserName : MessageCredentialType.None;
-			var address = new EndpointAddress(String.Format("https://{0}:{1}/{2}/{3}", HTTPSURL, HTTPSPort, accessPath, InterfaceName));
+			var address = new EndpointAddress(String.Format("https://{0}:{1}/{2}/{3}", LoginInfo.IP, LoginInfo.Password, accessPath, InterfaceName));
 			var res = new ChannelFactory<T>(binding, address);
 			if (requireAuth)
 			{
-				res.Credentials.UserName.UserName = HTTPSUsername;
-				res.Credentials.UserName.Password = HTTPSPassword;
+				res.Credentials.UserName.UserName = LoginInfo.Username;
+				res.Credentials.UserName.Password = LoginInfo.Password;
 				res.Credentials.Windows.AllowedImpersonationLevel = TokenImpersonationLevel.Impersonation;
 			}
 			return res;
diff --git a/TGS.Interface/TGS.Interface.csproj b/TGS.Interface/TGS.Interface.csproj
index fa07f5838f..7fcfc32cbb 100644
--- a/TGS.Interface/TGS.Interface.csproj
+++ b/TGS.Interface/TGS.Interface.csproj
@@ -65,6 +65,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Components\Repository.cs" />
     <Compile Include="PullRequestInfo.cs" />
+    <Compile Include="RemoteLoginInfo.cs" />
     <Compile Include="RootCommand.cs" />
     <Compile Include="ServerInterface.cs" />
     <Compile Include="..\AssemblyInfo.global.cs" />
diff --git a/TGS.Tests/ServiceInterface/TestInterface.cs b/TGS.Tests/ServiceInterface/TestInterface.cs
index cd4f55ac9d..79552086ef 100644
--- a/TGS.Tests/ServiceInterface/TestInterface.cs
+++ b/TGS.Tests/ServiceInterface/TestInterface.cs
@@ -52,7 +52,7 @@ namespace TGS.Interface.Tests
 		/// <returns>The created <see cref="Interface"/></returns>
 		ServerInterface CreateFakeRemoteInterface()
 		{
-			return new ServerInterface("some.fake.url.420", 34752, "user", "password");
+			return new ServerInterface(new RemoteLoginInfo("some.fake.url.420", 34752, "user", "password"));
 		}
 
 		/// <summary>
@@ -77,9 +77,11 @@ namespace TGS.Interface.Tests
 		public void TestCopyRemoteInterface()
 		{
 			var first = CreateFakeRemoteInterface();
-			var second = new ServerInterface(first);
-			Assert.AreEqual(first.HTTPSURL, second.HTTPSURL);
-			Assert.AreEqual(first.HTTPSPort, second.HTTPSPort);
+			var second = new ServerInterface(first.LoginInfo);
+			Assert.AreEqual(first.LoginInfo.IP, second.LoginInfo.IP);
+			Assert.AreEqual(first.LoginInfo.Port, second.LoginInfo.Port);
+			Assert.AreEqual(first.LoginInfo.Username, second.LoginInfo.Username);
+			Assert.AreEqual(first.LoginInfo.Password, second.LoginInfo.Password);
 			Assert.IsTrue(second.IsRemoteConnection);
 		}