diff --git a/WP_Auth0.php b/WP_Auth0.php
index 3acecfd8..5760da03 100644
--- a/WP_Auth0.php
+++ b/WP_Auth0.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Auth0 for WordPress
  * Description: Let your users login with any social provider from Twitter to Facebook as well as many others like Github. Enterprise? We've got you covered - <a href="https://auth0.com">Auth0</a> is a full enterprise solution and will work with your Active Directory or any other environment to take control of your wordpress sites.
- * Version: 2.1.7
+ * Version: 2.1.8
  * Author: Auth0
  * Author URI: https://auth0.com
  */
@@ -12,7 +12,7 @@
 define( 'WPA0_PLUGIN_URL', trailingslashit( plugin_dir_url( __FILE__ ) ) );
 define( 'WPA0_LANG', 'wp-auth0' );
 define( 'AUTH0_DB_VERSION', 4 );
-define( 'WPA0_VERSION', '2.1.7' );
+define( 'WPA0_VERSION', '2.1.8' );
 
 /**
  * Main plugin class
diff --git a/assets/css/initial-setup/main.styl b/assets/css/initial-setup/main.styl
index 1070810e..96ce4251 100644
--- a/assets/css/initial-setup/main.styl
+++ b/assets/css/initial-setup/main.styl
@@ -771,7 +771,7 @@
     margin: 30px 0 10px;
   }
   
-  p.a0-message.manage {
+  .a0-message.manage {
     margin-bottom: 30px;
     margin-top: 30px;
   }
diff --git a/templates/initial-setup/connection_profile.php b/templates/initial-setup/connection_profile.php
index c8b70a3f..4886b439 100644
--- a/templates/initial-setup/connection_profile.php
+++ b/templates/initial-setup/connection_profile.php
@@ -11,10 +11,9 @@
       <div class="a0-step-text a0-message a0-warning">
 
         <b>Important:</b>
-        <?php _e('To continue you need an Auth0 account, don\'t have one yet? Click ', WPA0_LANG); ?>
-        <a href="https://auth0.com" about="_blank"><?php _e('here', WPA0_LANG); ?></a>
+        <?php _e('To continue you need an Auth0 account, don\'t have one yet?', WPA0_LANG); ?>
 
-        <button class="a0-button default pull-right">Sign up for free</button>
+        <a class="a0-button default pull-right" href="https://auth0.com" about="_blank">Sign up for free</a>
 
       </div>
     </div>
diff --git a/templates/initial-setup/consent-disclaimer.php b/templates/initial-setup/consent-disclaimer.php
index b94df91f..9dbab94d 100644
--- a/templates/initial-setup/consent-disclaimer.php
+++ b/templates/initial-setup/consent-disclaimer.php
@@ -11,10 +11,10 @@
 			<a href=""  class="a0-button secondary"><?php echo _e('Skip the wizard'); ?></a>
 		</div>
 
-		<p class="a0-message a0-notice">
+		<div class="a0-message a0-notice">
 			<b><?php echo _e('IMPORTANT'); ?>:</b>
 			<?php echo _e('This plug-in replaces the standard WordPress login screen. The experience is improved of course, but different.  By default, there is a link to the regular WordPress login screen should you need it.'); ?>
-		</p>
+		</div>
 
 	</div>
 </div>
diff --git a/templates/settings.php b/templates/settings.php
index 45e222b3..f49715d1 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -7,9 +7,9 @@
 		<div class="row">
 			<h1><?php _e('Auth0 WordPress Plugin Settings', WPA0_LANG); ?></h1>
 
-			<p class="row a0-message a0-warning manage">
+			<div class="row a0-message a0-warning manage">
 				For your Auth0 dashboard with more settings click <a href="https://manage.auth0.com">here</a>.
-			</p>
+			</div>
 			
 	    <?php if( count(get_settings_errors()) == 0 && isset($_GET['settings-updated']) ) { ?>
 	        <div id="message" class="updated">
@@ -44,10 +44,10 @@
 		    		<span>Updating the connections settings</span>
 		    	</div>
 
-		    	<p class="a0-message a0-tip row">
+		    	<div class="a0-message a0-tip row">
       			<b>Pro Tip:</b>
       			To set your own app keys and settings for the social connections, access the <a target="_blank" href="https://manage.auth0.com/#/connections/social">Auth0 Dashboard</a>. 
-       		</p>
+       		</div>
 
 		    	<div class="connections row">
 					  <?php foreach($social_connections as $social_connection) { ?>