diff --git a/src/browser/modules/User/UserAdd.jsx b/src/browser/modules/User/UserAdd.jsx
index 46e2e754f2e..24ac13a7706 100644
--- a/src/browser/modules/User/UserAdd.jsx
+++ b/src/browser/modules/User/UserAdd.jsx
@@ -300,7 +300,7 @@ export class UserAdd extends Component {
         <StyledFormElement>
           <StyledLabel>
             <StyledInput
-              onClick={this.updateForcePasswordChange.bind(this)}
+              onChange={this.updateForcePasswordChange.bind(this)}
               checked={this.state.forcePasswordChange}
               disabled={isLoading}
               type='checkbox'
diff --git a/src/shared/modules/cypher/boltUserHelper.js b/src/shared/modules/cypher/boltUserHelper.js
index 16bb30452ea..492c6bfe226 100644
--- a/src/shared/modules/cypher/boltUserHelper.js
+++ b/src/shared/modules/cypher/boltUserHelper.js
@@ -29,7 +29,7 @@ export function createDatabaseUser ({
   password,
   forcePasswordChange
 }) {
-  return `CALL dbms.security.createUser("${username}", "${password}", ${forcePasswordChange})`
+  return `CALL dbms.security.createUser("${username}", "${password}", ${!!forcePasswordChange})`
 }
 export function deleteUser (username) {
   return `CALL dbms.security.deleteUser("${username}")`