diff --git a/public/options/options.css b/public/options/options.css
index 0b10a3f9..b80bf116 100644
--- a/public/options/options.css
+++ b/public/options/options.css
@@ -76,7 +76,7 @@ body {
     color: white;
 }
 
-.string-container {
+.text-label-container {
     font-size: 14px;
     color: white;
 }
diff --git a/public/options/options.html b/public/options/options.html
index b778acad..b2a03ddc 100644
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -248,7 +248,7 @@
 			<br/>
 			<br/>
 	
-			<div option-type="text-change" sync-option="userID" confirm-message="userIDChangeWarning">
+			<div option-type="private-text-change" sync-option="userID" confirm-message="userIDChangeWarning">
 				<div class="option-button trigger-button">
 					__MSG_changeUserID__
 				</div>
@@ -274,13 +274,15 @@
 			<br/>
 			<br/>
 
-			<div option-type="string-change" sync-option="serverAddress">
-				<label class="string-container">
+			<div option-type="text-change" sync-option="serverAddress">
+				<label class="text-label-container">
 					<div>__MSG_customServerAddress__</div>
-				  <input class="option-text-box" type="text">
+
+					<input class="option-text-box" type="text">
 				</label>
-				<div class="option-button custom-server-address-button inline">
-						__MSG_saveCustomServerAddress__
+
+				<div class="option-button text-change-set inline">
+					__MSG_saveCustomServerAddress__
 				</div>
 	
 				<br/>
diff --git a/src/options.ts b/src/options.ts
index 06528a02..1b44d095 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -55,28 +55,29 @@ async function init() {
                 });
                 break;
             case "text-change":
-                let button = optionsElements[i].querySelector(".trigger-button");
-                button.addEventListener("click", () => activateTextChange(<HTMLElement> optionsElements[i]));
-
                 let textChangeOption = optionsElements[i].getAttribute("sync-option");
-                // See if anything extra must be done
-                switch (textChangeOption) {
-                    case "invidiousInstances":
-                        invidiousInstanceAddInit(<HTMLElement> optionsElements[i], textChangeOption);
-                }
+                let textInput = <HTMLInputElement> optionsElements[i].querySelector(".option-text-box");
+                
+                let setButton = <HTMLElement> optionsElements[i].querySelector(".text-change-set");
 
-                break;
-            case "string-change":
-                let stringChangeOption = optionsElements[i].getAttribute("sync-option");
-                let stringInput = <HTMLInputElement> optionsElements[i].querySelector(".string-container").querySelector(".option-text-box");
-                let saveButton = <HTMLElement> optionsElements[i].querySelector(".option-button");
+                textInput.value = Config.config[textChangeOption];
 
-                stringInput.value = Config.config[stringChangeOption];
-
-                saveButton.addEventListener("click", () => {
-                   setStringConfigOption(stringInput.value, stringChangeOption);
+                setButton.addEventListener("click", () => {
+                    Config.config[textChangeOption] = textInput.value;
                 });
     
+                break;
+            case "private-text-change":
+                let button = optionsElements[i].querySelector(".trigger-button");
+                button.addEventListener("click", () => activatePrivateTextChange(<HTMLElement> optionsElements[i]));
+
+                let privateTextChangeOption = optionsElements[i].getAttribute("sync-option");
+                // See if anything extra must be done
+                switch (privateTextChangeOption) {
+                    case "invidiousInstances":
+                        invidiousInstanceAddInit(<HTMLElement> optionsElements[i], privateTextChangeOption);
+                }
+
                 break;
             case "keybind-change":
                 let keybindButton = optionsElements[i].querySelector(".trigger-button");
@@ -110,16 +111,6 @@ async function init() {
     optionsContainer.classList.add("animated");
 }
 
-/**
- * Set the value in the string input the the defined config option
- * 
- * @param element
- * @param option
- */
-function setStringConfigOption(value: string, option: string) {
-    Config.config[option] = value;
-}
-
 /**
  * Called when the config is updated
  * 
@@ -305,7 +296,7 @@ function keybindKeyPressed(element: HTMLElement, e: KeyboardEvent) {
  * 
  * @param element 
  */
-function activateTextChange(element: HTMLElement) {
+function activatePrivateTextChange(element: HTMLElement) {
     let button = element.querySelector(".trigger-button");
     if (button.classList.contains("disabled")) return;