diff --git a/front/src/components/house/EditHouse.jsx b/front/src/components/house/EditHouse.jsx
index 5ed0d4c17b..7c303fc8fe 100644
--- a/front/src/components/house/EditHouse.jsx
+++ b/front/src/components/house/EditHouse.jsx
@@ -115,11 +115,11 @@ const EditHouse = ({ children, ...props }) => (
                 onInput={props.updateHouseAlarmCode}
               />
             </Localizer>
-            <span class="input-icon-addon cursor-pointer" onClick={props.togglePassword}>
+            <span class="input-icon-addon cursor-pointer" onClick={props.toggleAlarmCodePassword}>
               <i
                 class={cx('fe', {
-                  'fe-eye': !props.showPassword,
-                  'fe-eye-off': props.showPassword
+                  'fe-eye': !props.showAlarmCode,
+                  'fe-eye-off': props.showAlarmCode
                 })}
               />
             </span>
diff --git a/front/src/components/house/EditHouseComponent.jsx b/front/src/components/house/EditHouseComponent.jsx
index 7b0bed0f14..0da0836b78 100644
--- a/front/src/components/house/EditHouseComponent.jsx
+++ b/front/src/components/house/EditHouseComponent.jsx
@@ -63,15 +63,21 @@ class EditHouseComponent extends Component {
       this.addRoom();
     }
   };
+  toggleAlarmCodePassword = () => {
+    this.setState(prevState => {
+      return { ...prevState, showAlarmCode: !this.state.showAlarmCode };
+    });
+  };
   constructor(props) {
     super(props);
     this.props = props;
     this.state = {
-      newRoomName: ''
+      newRoomName: '',
+      showAlarmCode: false
     };
   }
 
-  render(props, { newRoomName, wantToDeleteHouse, loading }) {
+  render(props, { newRoomName, wantToDeleteHouse, loading, showAlarmCode }) {
     return (
       <EditHouse
         {...props}
@@ -90,6 +96,8 @@ class EditHouseComponent extends Component {
         deleteHouse={this.deleteHouse}
         confirmDeleteHouse={this.confirmDeleteHouse}
         cancelDeleteHouse={this.cancelDeleteHouse}
+        toggleAlarmCodePassword={this.toggleAlarmCodePassword}
+        showAlarmCode={showAlarmCode}
         loading={loading}
       />
     );