diff --git a/docassemble/MOHUDEvictionProject/data/questions/file_a_motion.yml b/docassemble/MOHUDEvictionProject/data/questions/file_a_motion.yml
index ce13423..39060b9 100644
--- a/docassemble/MOHUDEvictionProject/data/questions/file_a_motion.yml
+++ b/docassemble/MOHUDEvictionProject/data/questions/file_a_motion.yml
@@ -781,6 +781,10 @@ review:
       % else:
       **None**
       % endif
+  - Edit: 
+      - users[0].attorney[0].name.first
+    button: |
+      Tenant's attorney: **${ users[0].attorney[0].name }**
   - note: | 
       ##Information about the other party##
   - Edit:
diff --git a/docassemble/MOHUDEvictionProject/data/questions/review.yml b/docassemble/MOHUDEvictionProject/data/questions/review.yml
index 5131b32..b2ed680 100644
--- a/docassemble/MOHUDEvictionProject/data/questions/review.yml
+++ b/docassemble/MOHUDEvictionProject/data/questions/review.yml
@@ -395,6 +395,10 @@ review:
       % else:
       **None**
       % endif
+  - Edit: 
+      - users[0].attorney[0].name.first
+    button: |
+      Tenant's attorney: **${ users[0].attorney[0].name }**
   - Edit:
       - will_offer_payment
       - recompute:
@@ -406,19 +410,6 @@ review:
       The tenant is able to pay rent and {court costs}:
       % endif
       **${ "Maybe" if will_offer_payment is None else yesno(will_offer_payment) }**
-  - note: |
-      % if person_answering == "attorney":
-      ##About the Tenant's attorney##
-      % endif
-    show if: person_answering == "attorney"
-  - Edit: 
-      - users[0].attorney[0].name.first
-    button: |
-      Tenant's attorney: 
-      
-      % if person_answering == "attorney":
-        - **${ users[0].attorney[0].name }**
-      % endif
   - raw html: |
       ${ next_accordion("Information about your landlord", showing=False) }
   - Edit: