diff --git a/src/components/RoadmapHeader.astro b/src/components/RoadmapHeader.astro
index 9608ebfec..611987a75 100644
--- a/src/components/RoadmapHeader.astro
+++ b/src/components/RoadmapHeader.astro
@@ -55,7 +55,7 @@ const isRoadmapReady = !isUpcoming;
 
               {isRoadmapReady && (
                 <button
-                  data-popup='download-popup'
+                  data-popup='login-popup'
                   class='inline-flex items-center justify-center bg-yellow-400 py-1.5 px-3 text-xs sm:text-sm font-medium rounded-md hover:bg-yellow-500'
                   aria-label='Download Roadmap'
                   ga-category='Subscription'
@@ -68,7 +68,7 @@ const isRoadmapReady = !isUpcoming;
               )}
 
               <button
-                data-popup='subscribe-popup'
+                data-popup='login-popup'
                 class='inline-flex items-center justify-center bg-yellow-400 py-1.5 px-3 text-xs sm:text-sm font-medium rounded-md hover:bg-yellow-500'
                 aria-label='Subscribe for Updates'
                 ga-category='Subscription'
@@ -78,17 +78,6 @@ const isRoadmapReady = !isUpcoming;
                 <Icon icon='email' />
                 <span class='ml-2'>Subscribe</span>
               </button>
-              <button
-                data-popup='login-popup'
-                class='inline-flex items-center justify-center bg-yellow-400 py-1.5 px-3 text-xs sm:text-sm font-medium rounded-md hover:bg-yellow-500'
-                aria-label='Login to Subscribe for Updates'
-                ga-category='Login'
-                ga-action='Clicked Popup Opener'
-                ga-label='Login Roadmap Popup'
-              >
-                <Icon icon='email' />
-                <span class='ml-2'>Login</span>
-              </button>
             </>
           )
         }
diff --git a/src/components/TopicOverlay/TopicOverlay.astro b/src/components/TopicOverlay/TopicOverlay.astro
index ce322a61a..13cc7f9ce 100644
--- a/src/components/TopicOverlay/TopicOverlay.astro
+++ b/src/components/TopicOverlay/TopicOverlay.astro
@@ -21,7 +21,7 @@ const { contentContributionLink } = Astro.props;
 
     <div id='topic-actions' class='hidden mb-2'>
       <button
-        id='mark-topic-done'
+        data-popup='login-popup'
         ga-category='TopicClick'
         ga-action='topic/mark-completion'
         ga-label='done'
@@ -36,7 +36,7 @@ const { contentContributionLink } = Astro.props;
         ga-category='TopicClick'
         ga-action='topic/mark-completion'
         ga-label='pending'
-        class='hidden bg-red-600 text-white p-1 px-2 text-sm rounded-md hover:bg-red-700 inline-flex items-center'
+        class='hidden bg-red-600 text-white p-1 px-2 text-sm rounded-md hover:bg-red-700 items-center'
       >
         <Icon icon='reset' />
         <span class='ml-2'>Mark as Pending</span>