diff --git a/src/allmon3-passwd b/src/allmon3-passwd
index 190d821..2d8245a 100755
--- a/src/allmon3-passwd
+++ b/src/allmon3-passwd
@@ -12,6 +12,8 @@ import csv
 import logging
 import sys
 
+from getpass import GetPassWarning, getpass
+
 _BUILD_ID = "@@HEAD-DEVELOP@@"
 
 def get_user_index(lst, k, v):
@@ -72,8 +74,12 @@ if args.delete:
         log.error("No user {} in file".format(args.user))
 
 else:
-    pass_a = input("Enter the password for {}: ".format(args.user))
-    pass_b = input("Confirm the password for {}: ".format(args.user))
+    try:
+        pass_a = getpass("Enter the password for {}: ".format(args.user))
+        pass_b = getpass("Confirm the password for {}: ".format(args.user))
+    except GetPassWarning:
+        log.error("unable to turn off echo for password entry")
+        sys.exit(-1)
 
     if(pass_a != pass_b):
         log.error("passwords do not match")
diff --git a/web/index.html b/web/index.html
index 0a5e66f..586c3be 100644
--- a/web/index.html
+++ b/web/index.html
@@ -76,7 +76,7 @@
 <div class="modal fade" id="loginModal" tabindex="-1" aria-labelledby="loginModalLabel"
 	 aria-hidden="true" data-bs-backdrop="static" data-bs-target="#staticBackdrop">
 	<div class="modal-dialog">
-		<form id="loginBox">
+		<form id="loginBox" onsubmit="doLogin(); return false;">
 		<div id="login-modal-content" class="modal-content">
 			<div class="modal-header">
 				<h5 class="modal-title" id="loginModalLabel">Login</h5>
@@ -104,7 +104,7 @@ <h5 class="modal-title" id="loginModalLabel">Login</h5>
 			</div>
 			<div id="login-modal-footer" class="modal-footer mt-2">
 				<input type="hidden" id="login-action" name="action" value="login">
-				<button type="button" class="btn btn-secondary" onclick="doLogin()">Login</button>
+				<button type="submit" class="btn btn-secondary">Login</button>
 				<button type="button" class="btn btn-secondary" onclick="clearLogin()" data-bs-dismiss="modal">Cancel</button>
 			</div>
 		</div>