diff --git a/frontend/resources/styles/main/partials/af-signup-questions.scss b/frontend/resources/styles/main/partials/af-signup-questions.scss
index 00f0a9627..19f9ab983 100644
--- a/frontend/resources/styles/main/partials/af-signup-questions.scss
+++ b/frontend/resources/styles/main/partials/af-signup-questions.scss
@@ -11,7 +11,7 @@
   overflow-y: auto;
   padding: 3rem;
   width: 100% !important;
-  
+
   h1, h3 {
     font-family: 'worksans', sans-serif !important;
     margin-bottom: .8rem;
@@ -84,7 +84,7 @@
     display: flex;
     margin-top: 2rem;
   }
-  
+
   .af-step-next button {
     color: $color-black;
     background-color: $color-primary;
@@ -104,36 +104,40 @@
     margin: 2rem 0;
   }
 
-  .af-choice-option input:checked+label:before, .af-legal input:checked+label:before {
+  .af-choice-option input:checked+label:before,
+  .af-legal input:checked+label:before {
     background-color: $color-primary;
   }
 
-  .af-choice-option input#af-uid-416:checked+label,
-  .af-choice-option input#af-uid-417:checked+label,
-  .af-choice-option input#af-uid-418:checked+label,
-  .af-choice-option input#af-uid-419:checked+label,
-  .af-choice-option input#af-uid-420:checked+label,
-  .af-choice-option input#af-uid-421:checked+label,
-  .af-choice-option input#af-uid-424:checked+label,
-  .af-choice-option input#af-uid-425:checked+label,
-  .af-choice-option input#af-uid-426:checked+label,
-  .af-choice-option input#af-uid-427:checked+label {
+  .af-field-use_of_penpot .af-choice-option input:checked+label,
+  .af-field-previous_design_tool .af-choice-option input:checked+label {
     &::before {
       background-color: transparent;
       border: 2px solid $color-primary;
     }
   }
 
-  label[for=af-uid-416],
-  label[for=af-uid-417],
-  label[for=af-uid-418],
-  label[for=af-uid-419],
-  label[for=af-uid-420],
-  label[for=af-uid-421],
-  label[for=af-uid-424],
-  label[for=af-uid-425],
-  label[for=af-uid-426],
-  label[for=af-uid-427] {
+  .af-field-use_of_penpot .af-choice-option label {
+    padding-top: 6rem;
+    background-size: 120px;
+    min-height: 150px;
+  }
+
+  .af-field-use_of_penpot .af-choice-option:nth-child(1) label {
+    background-image: url("../images/form/use-for-1.jpg");
+  }
+  .af-field-use_of_penpot .af-choice-option:nth-child(2) label {
+    background-image: url("../images/form/use-for-2.jpg");
+  }
+  .af-field-use_of_penpot .af-choice-option:nth-child(3) label {
+    background-image: url("../images/form/use-for-3.jpg");
+  }
+  .af-field-use_of_penpot .af-choice-option:nth-child(4) label {
+    background-image: url("../images/form/use-for-4.jpg");
+  }
+
+  .af-field-use_of_penpot label,
+  .af-field-previous_design_tool label {
     display: flex;
     padding-top: 5rem;
     justify-content: center;
@@ -160,59 +164,34 @@
       left: 0;
       margin: 0;
     }
-    
+
     &::after {
       display: none !important;
     }
-
-  }
-  
-  label[for=af-uid-424],
-  label[for=af-uid-425],
-  label[for=af-uid-426],
-  label[for=af-uid-427] {
-    padding-top: 6rem;
-    background-size: 120px;
-    min-height: 150px;
   }
 
-  label[for=af-uid-416] {
+  .af-field-previous_design_tool .af-choice-option:nth-child(1) label {
     background-image: url("../images/form/figma.png");
+
   }
 
-  label[for=af-uid-417] {
+  .af-field-previous_design_tool .af-choice-option:nth-child(2) label {
     background-image: url("../images/form/sketch.png");
   }
 
-  label[for=af-uid-418] {
+  .af-field-previous_design_tool .af-choice-option:nth-child(3) label {
     background-image: url("../images/form/adobe-xd.png");
   }
 
-  label[for=af-uid-419] {
+  .af-field-previous_design_tool .af-choice-option:nth-child(4) label {
     background-image: url("../images/form/uxpin.png");
   }
-  
-  label[for=af-uid-420] {
+
+  .af-field-previous_design_tool .af-choice-option:nth-child(5) label {
     background-image: url("../images/form/invision.png");
   }
-  
-  label[for=af-uid-421] {
+
+  .af-field-previous_design_tool .af-choice-option:nth-child(6) label {
     background-image: url("../images/form/never-used.png");
   }
-  
-  label[for=af-uid-424] {
-    background-image: url("../images/form/use-for-1.jpg");
-  }
-  
-  label[for=af-uid-425] {
-    background-image: url("../images/form/use-for-2.jpg");
-  }
-  
-  label[for=af-uid-426] {
-    background-image: url("../images/form/use-for-3.jpg");
-  }
-  
-  label[for=af-uid-427] {
-    background-image: url("../images/form/use-for-4.jpg");
-  }
-}
\ No newline at end of file
+}
diff --git a/frontend/src/app/main/ui.cljs b/frontend/src/app/main/ui.cljs
index 0ef678935..ab8dbeef4 100644
--- a/frontend/src/app/main/ui.cljs
+++ b/frontend/src/app/main/ui.cljs
@@ -83,7 +83,9 @@
         (when-let [props (some-> profile (get :props {}))]
           (cond
             (and cf/onboarding-form-id
-                 (not (:onboarding-questions-answered props false)))
+                 (not (:onboarding-questions-answered props false))
+                 (not (:onboarding-viewed props false)))
+
             [:& app.main.ui.onboarding.questions/questions
              {:profile profile
               :form-id cf/onboarding-form-id}]