diff --git a/src/pages/App/MenuList.js b/src/pages/App/MenuList.js
index bf6c867..afc5508 100644
--- a/src/pages/App/MenuList.js
+++ b/src/pages/App/MenuList.js
@@ -111,14 +111,6 @@ export const MenuList = observer((props) => {
           </Link>
         </Menu.Item>
       )}
-      {store.authentication.userData.role !== "Retail" && (
-        <Menu.Item key="retail">
-          <Link to={LINKS.PRODUCT}>
-            <DatabaseOutlined />
-            <span>Product</span>
-          </Link>
-        </Menu.Item>
-      )}
       <Menu.Item key="payback">
         <Link to={LINKS.PAYBACK}>
           <DatabaseOutlined />
diff --git a/src/pages/Membership/MembershipModal.js b/src/pages/Membership/MembershipModal.js
index 6eb78b4..bfc0a59 100644
--- a/src/pages/Membership/MembershipModal.js
+++ b/src/pages/Membership/MembershipModal.js
@@ -51,7 +51,7 @@ export const MembershipModal = ({
         name="form_in_modal"
         initialValues={initialData}
       >
-        {initialData.id && !initialData.isChangePassword && (
+        {((initialData.id && !initialData.isChangePassword) || !initialData.id) && (
           <Form.Item
             name="username"
             label="Username"
@@ -60,7 +60,7 @@ export const MembershipModal = ({
             <Input />
           </Form.Item>
         )}
-        {initialData.id && initialData.isChangePassword && (
+        {((initialData.id && initialData.isChangePassword) || !initialData.id) && (
           <Form.Item
             name="password"
             label="Password"
@@ -69,7 +69,7 @@ export const MembershipModal = ({
             <Input />
           </Form.Item>
         )}
-        {initialData.id && !initialData.isChangePassword && (
+        {((initialData.id && !initialData.isChangePassword) || !initialData.id) && (
           <Form.Item
             name="roleId"
             label="Role"