- <% if ( introMsg ) { %>
+ <% if ( !isActive ) { %>
+
+
+ <%- gettext( "You need to activate your account before you can enroll in courses. Check your inbox for an activation email. After you complete activation you can return and refresh this page." ) %>
+
+
+ <% } else if ( introMsg ) { %>
<%- introMsg %>
<% } %>
<% } %>
@@ -17,69 +23,63 @@
<% if ( requirements['account-activation-required'] ) { %>
-
-
<%- gettext( "Activate Your Account" ) %>
-
-
-
+
+
<%- gettext( "Activate Your Account" ) %>
+
+
+
-
-
- <%- gettext( "Check your email" ) %>
- <%-
- gettext( "You need to activate your account before you can register for courses. Check your inbox for an activation email." )
- %>
-
-
- <% if ( requirements['webcam-required'] ) { %>
-
-
<%- gettext( "Webcam" ) %>
-
-
-
-
-
-
+
+
+ <% } %>
<% } %>
- <% if ( nextStepTitle ) { %>
+ <% if ( nextStepTitle && isActive ) { %>
diff --git a/lms/templates/verify_student/make_payment_step.underscore b/lms/templates/verify_student/make_payment_step.underscore
index e2f6936cb0..389436b232 100644
--- a/lms/templates/verify_student/make_payment_step.underscore
+++ b/lms/templates/verify_student/make_payment_step.underscore
@@ -105,6 +105,8 @@
gettext( "You can pay now even if you don't have the following items available, but you will need to have these by %(date)s to qualify to earn a Verified Certificate." ),
{ date: verificationDeadline }
) %>
+ <% } else if ( !isActive ) { %>
+ <%- gettext( "You need to activate your account before you can enroll in courses. Check your inbox for an activation email. After you complete activation you can return and refresh this page." ) %>
<% } else if ( !upgrade ) { %>
<%- gettext( "You can pay now even if you don't have the following items available, but you will need to have these to qualify to earn a Verified Certificate." ) %>
<% } %>
@@ -116,66 +118,60 @@
<% if ( requirements['account-activation-required'] ) { %>
-
-
<%- gettext( "Activate Your Account" ) %>
-
-
-
+
+
<%- gettext( "Activate Your Account" ) %>
+
+
+
-
-
- <%- gettext( "Check your email" ) %>
- <%-
- gettext( "You need to activate your account before you can enroll in courses. Check your inbox for an activation email." )
- %>
-
-
<% if ( requirements['account-activation-required'] ) { %>
-
-
<%- gettext( "Activate Your Account" ) %>
-
-
-
+
+
<%- gettext( "Activate Your Account" ) %>
+
+
+
-
-
- <%- gettext( "Check your email." ) %>
- <%-
- gettext( "You need to activate your account before you can enroll in courses. Check your inbox for an activation email." )
- %>
-
-
-
-
- <% } %>
+
+
+ <%- gettext( "Check your email" ) %>
+ <%-
+ gettext( "You need to activate your account before you can enroll in courses. Check your inbox for an activation email." )
+ %>
+
+