diff --git a/pages/managers.php b/pages/managers.php
index f828c72..9b428fa 100644
--- a/pages/managers.php
+++ b/pages/managers.php
@@ -16,13 +16,24 @@ if ($VARS['man'] && $database->has('accounts', ['username' => $VARS['man']])) {
 }
 ?>
 
-<form role="form" action="action.php" method="POST">
+<?php if ($employees !== false) { ?>
+    <form role="form" action="action.php" method="POST">
+    <?php } ?>
     <div class="alert alert-brown"><?php lang("select a manager to view or edit employees"); ?></div>
     <div class="row">
         <div class="col-xs-12 col-md-6">
             <div class="form-group">
                 <label for="manager-box"><i class="fa fa-id-card-o"></i> <?php lang("manager"); ?></label><br />
-                <input type="text" id="manager-box" class="form-control" value="<?php echo $user ?>" name="manager" placeholder="<?php lang("type to select a manager"); ?>" />
+                <div class="row">
+                    <div class="col-xs-8 col-sm-10 col-md-9 col-lg-10">
+                        <input type="text"<?php if ($employees === false) { ?>id="manager-box"<?php } ?> class="form-control" value="<?php echo $user ?>" name="manager" placeholder="<?php lang("type to select a manager"); ?>" <?php if ($employees !== false) { echo "readonly"; }?>/>
+                    </div>
+                    <div class="col-xs-4 col-sm-2 col-md-3 col-lg-2">
+                        <?php if ($employees === false) { ?>
+                            <button class="btn btn-default" type="button" id="selectmanagerbtn"><i class="fa fa-chevron-right"></i> <?php lang("next") ?></button>
+                        <?php } ?>
+                    </div>
+                </div>
             </div>
         </div>
         <?php
@@ -63,5 +74,5 @@ if ($VARS['man'] && $database->has('accounts', ['username' => $VARS['man']])) {
 
 <?php if ($employees !== false) { ?>
     <button type="submit" class="btn btn-success pull-right" id="save-btn"><i class="fa fa-floppy-o"></i> <?php lang("save"); ?></button>
-<?php } ?>
-</form>
\ No newline at end of file
+    </form>
+<?php } ?>
\ No newline at end of file
diff --git a/static/js/managers.js b/static/js/managers.js
index 94bd3d2..99db6a3 100644
--- a/static/js/managers.js
+++ b/static/js/managers.js
@@ -62,6 +62,16 @@ var manoptions = {
 
 $("#manager-box").easyAutocomplete(manoptions);
 
+$("#manager-box").keyup(function (e) {
+    if (e.keyCode == 13) {
+        $("#selectmanagerbtn").click();
+    }
+});
+
+$("#selectmanagerbtn").click(function () {
+    document.location.href = "app.php?page=managers&man=" + $("#manager-box").val();
+});
+
 $("#people-box").keyup(function (event) {
     if (event.keyCode == 13) {
         $("#addpersonbtn").click();