diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx
index 528bb0303..9b25d8aa6 100644
--- a/src/pages/Login.jsx
+++ b/src/pages/Login.jsx
@@ -32,8 +32,7 @@ function Login(props) {
         }
         catch(err) {
         props.navigate("/login");
-        }
-        
+        }  
     }
     else {
         props.navigate("/login");
@@ -69,6 +68,7 @@ function Login(props) {
                                     value={props.loginValues.password}
                                     style={{color: 'white', width: '100%'}}
                                     disableUnderline
+                                    required
                                     endAdornment={
                                         <InputAdornment position="end">
                                         <IconButton
@@ -83,7 +83,7 @@ function Login(props) {
                                     />
                             </div>
                             <div className="login-form__row">
-                                <button className="login-form__submit button button--main button--full" id="submit" onClick={loginAccount}>
+                                <button disabled={!props.loginValues.password} className="login-form__submit button button--main button--full" id="submit" onClick={loginAccount}>
                                     Login
                                 </button>
                             </div>
diff --git a/src/pages/SignUp.jsx b/src/pages/SignUp.jsx
index 404e28781..bcad55c9b 100644
--- a/src/pages/SignUp.jsx
+++ b/src/pages/SignUp.jsx
@@ -111,6 +111,7 @@ function SignUp(props) {
                             value={props.values.password}
                             style={{color: 'white', width: '100%'}}
                             disableUnderline
+                            required
                             endAdornment={
                                 <InputAdornment position="end">
                                 <IconButton
@@ -134,6 +135,7 @@ function SignUp(props) {
                             value={props.confirmValues.password}
                             style={{color: 'white', width: '100%'}}
                             disableUnderline
+                            required
                             endAdornment={
                                 <InputAdornment position="end">
                                 <IconButton
@@ -149,7 +151,7 @@ function SignUp(props) {
 						</div>
                         <PasswordStrengthBar password={props.values.password} />
 						<div className="login-form__row">
-							<button className="login-form__submit button button--main button--full" id="submit" onClick={createAccount}>
+							<button disabled={!props.values.password && !props.confirmValues.password} className="login-form__submit button button--main button--full" id="submit" onClick={createAccount}>
                                 Create Account
                             </button>
 						</div>