diff --git a/css/master.css b/css/master.css
index cf51559a..73809a54 100644
--- a/css/master.css
+++ b/css/master.css
@@ -505,3 +505,11 @@
 #inviteBtn:hover {
   background-color: #393939;
 }
+
+#usernameBtn {
+  cursor: pointer;
+}
+
+#usernameBtn:hover {
+  background-color: #393939;
+}
diff --git a/index.html b/index.html
index 5824b1a9..57e99f82 100644
--- a/index.html
+++ b/index.html
@@ -61,6 +61,14 @@ <h5 id='guildName'>discord-livebot</h5>
 
       <div id='options'>
         <input type='text' name='name' value='' placeholder='Username' id='usernameBox' class='optionBox'/>
+        <input type='button' name='invite' value='Set Username' id='usernameBtn' class='optionBox' onclick="changeUname()"/>
+        <br>
+        <hr style="border-color: #676767;">
+        <br><!--
+        <input type='number' name='name' value='0' placeholder='Max Uses' id='maxuses-inviteBox' class='optionBox'/>
+        <input type='number' name='name' value='0' placeholder='Max Age' id='maxage-inviteBox' class='optionBox'/>
+        <p id="temporaryText" style="margin-left: calc(50% - 40px); margin-bottom: 5px; margin-top: 5px; font-family: Tahoma, Geneva, sans-serif; color: white; font-size: 0.9em">Temporary?: </p>
+        <input type='checkbox' name='name' value=False placeholder='Username' id='temporary-inviteBox' style=" " class='optionBox'/>-->
         <input type='button' name='invite' value='Generate Invite' id='inviteBtn' class='optionBox' onclick="options('invite','')"/>
       </div>
     </div>
diff --git a/js/app.js b/js/app.js
index ccb03ca4..cc5e88ee 100644
--- a/js/app.js
+++ b/js/app.js
@@ -21,8 +21,7 @@ function create() {
   document.getElementById("usernameBox")
     .addEventListener("keyup", function(event) {
       if (event.keyCode === 13) {
-        options('username', document.getElementById('usernameBox').value);
-        document.getElementById("usernameBox").value = '';
+        changeUname()
       }
     });
 
@@ -619,6 +618,11 @@ function typing() {
 
 }
 
+function changeUname() {
+  options('username', document.getElementById('usernameBox').value);
+  document.getElementById("usernameBox").value = '';
+}
+
 function options(type, content) {
   switch(type) {
     case 'username':
@@ -627,8 +631,8 @@ function options(type, content) {
     break;
 
     case 'invite':
-      selectedChan.createInvite().then(invite => {command('Created invite for '+invite.guild.name+' \nhttps://discord.gg/'+invite.code);})
-
+      selectedChan.createInvite().then(invite => {command('Created invite for '+invite.guild.name+' \nhttps://discord.gg/'+invite.code);})//options.unique = true, options.temporary = document.getElementById('temporary-inviteBox').value, options.maxUses = document.getElementById('maxuses-inviteBox').value, options.maxAge = document.getElementById('maxage-inviteBox').value).then(invite => {command('Created invite for '+invite.guild.name+' \nhttps://discord.gg/'+invite.code);})
+      document.getElementById('usernameBox').value
     break;
   }
 }