diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 69e5a57d..a663e3b3 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -315,8 +315,8 @@ function guest_register()
     }
 
     return page_with_title(register_title(), [
-        __('By completing this form you\'re registering as a Chaos-Angel. This script will create you an account in the angel task scheduler.'),
-        form_info(entry_required() . ' = ' . __('Entry required!')),
+        form_element('', __('By completing this form you\'re registering as a Chaos-Angel. This script will create you an account in the angel task scheduler.')),
+        form_element('', entry_required() . ' = ' . __('Entry required!')),
         $msg,
         msg(),
         form([
@@ -357,7 +357,7 @@ function guest_register()
             $enable_password || $enable_planned_arrival ? div('row', [
                 $enable_password ? div('col', [
                     form_password('password', __('Password') . ' ' . entry_required()),
-                    form_info('', sprintf(__('Please use at least %s characters.'), $min_password_length)),
+                    form_element('', '<span class="help-block">' . icon('info-circle') . sprintf(__('Please use at least %s characters.'), $min_password_length) . '</span>'),
                 ]) : '',
 
                 $enable_planned_arrival ? div('col', [