diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep
index 70929d6..f82a256 100644
--- a/templates/default/join.html.ep
+++ b/templates/default/join.html.ep
@@ -94,16 +94,17 @@
                 <center>
                   <p><%=l 'YOU_CAN_PASSWORD_PROTECT_JOIN' %></p>
                 </center>
-                <div class="form-group">
+                <div class="input-group">
                   <input type="password" id="joinPass" class="form-control help" placeholder="<%=l 'PASSWORD' %>" data-toggle="tooltip" data-placement="bottom" title="<%=l 'PASSWORD_PROTECT' %>"/>
-                </div>
-                <div class="form-group">
-                  <input type="password" id="joinPass2" class="form-control help" placeholder="<%=l 'PASSWORD_CONFIRM' %>" data-toggle="tooltip" data-placement="bottom" title="<%=l 'PASSWORD_PROTECT' %>"/>
-                  <span class="form-group-btn">
-                    <button id="joinPassButton" type="submit" class="btn btn-default help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'PASSWORD_PROTECT' %>">
+                  <span class="input-group-btn">
+                    <button id="setJoinPassButton" type="button" class="btn btn-default help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'PASSWORD_PROTECT' %>">
                       <span class="glyphicon glyphicon-ok"
                       </span>
                     </button>
+                    <button id="removeJoinPassButton" type="button" class="btn btn-default help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'REMOVE_PASSWORD' %>">
+                      <span class="glyphicon glyphicon-remove"
+                      </span>
+                    </button>
                   </span>
                 </div>
               </form>