diff --git a/ui/src/index.css b/ui/src/index.css
index da3726e8..dcc28525 100644
--- a/ui/src/index.css
+++ b/ui/src/index.css
@@ -119,8 +119,13 @@ code, pre {
     margin-top: 25px;
 }
 
-#zrok-tou {
-    margin-top: 15px;
+.zrok-tou {
+    margin: 15px;
+    color: white;
+}
+
+.zrok-type {
+    font-family: 'Russo One', sans-serif;
 }
 
 #controls-row {
@@ -130,4 +135,4 @@ code, pre {
 
 #navbar {
     background: linear-gradient(180deg, #0E0238 0%, #231069 100%);
-}
\ No newline at end of file
+}
diff --git a/ui/src/register/SetPasswordForm.js b/ui/src/register/SetPasswordForm.js
index ef979ae0..c53f36db 100644
--- a/ui/src/register/SetPasswordForm.js
+++ b/ui/src/register/SetPasswordForm.js
@@ -4,13 +4,14 @@ import * as metadata from "../api/metadata"
 import Success from "./Success";
 import {Button, Container, Form, Row} from "react-bootstrap";
 import PasswordForm from "../components/password";
+import {Checkbox, FormControl, FormControlLabel, FormGroup, InputLabel} from "@mui/material";
 
 const SetPasswordForm = (props) => {
     const [password, setPassword] = useState('');
     const [message, setMessage] = useState();
     const [authToken, setAuthToken] = useState('');
     const [complete, setComplete] = useState(false);
-    const [tou, setTou] = useState();
+    const [tou, setTou] = useState(<span/>);
     const [passwordLength, setPasswordLength] = useState(10);
     const [passwordRequireCapital, setPasswordRequireCapital] = useState(true);
     const [passwordRequireNumeric, setPasswordRequireNumeric] = useState(true);
@@ -23,7 +24,7 @@ const SetPasswordForm = (props) => {
         metadata.configuration().then(resp => {
             if(!resp.error) {
                 if (resp.data.touLink !== undefined && resp.data.touLink.trim() !== "") {
-                    setTou(resp.data.touLink)
+                    setTou(<span dangerouslySetInnerHTML={{__html: resp.data.touLink}}/>)
                 }
                 setPasswordLength(resp.data.passwordRequirements.length)
                 setPasswordRequireCapital(resp.data.passwordRequirements.requireCapital)
@@ -73,14 +74,22 @@ const SetPasswordForm = (props) => {
                     <Container className={"fullscreen-form"}>
                         <Row>
                             <Form onSubmit={handleSubmit}>
-                                <PasswordForm
-                                    setMessage={setMessage}
-                                    passwordLength={passwordLength}
-                                    passwordRequireCapital={passwordRequireCapital}
-                                    passwordRequireNumeric={passwordRequireNumeric}
-                                    passwordRequireSpecial={passwordRequireSpecial}
-                                    passwordValidSpecialCharacters={passwordValidSpecialCharacters}
-                                    setParentPassword={setPassword}/>
+                                <div>
+                                    <PasswordForm
+                                        setMessage={setMessage}
+                                        passwordLength={passwordLength}
+                                        passwordRequireCapital={passwordRequireCapital}
+                                        passwordRequireNumeric={passwordRequireNumeric}
+                                        passwordRequireSpecial={passwordRequireSpecial}
+                                        passwordValidSpecialCharacters={passwordValidSpecialCharacters}
+                                        setParentPassword={setPassword}/>
+                                </div>
+                                <div class={"zrok-tou"}>
+                                    <p>{tou}</p>
+                                </div>
+                                <div class={"zrok-tou"}>
+                                    <FormControlLabel control={<Checkbox iconStyle={{fill: 'white'}} required/>} label={<span class={"zrok-type"}>I have read and agree to the above</span>}/>
+                                </div>
                                 <Button variant={"light"} type={"submit"}>Register Account</Button>
                             </Form>
                         </Row>
@@ -88,7 +97,7 @@ const SetPasswordForm = (props) => {
                             {message}
                         </Row>
                         <Row>
-                            <div id={"zrok-tou"} dangerouslySetInnerHTML={{__html: tou}}></div>
+
                         </Row>
                     </Container>
                 </Row>