diff --git a/app/helpers.php b/app/helpers.php
index 8d0649ac..bbdcdf7f 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -631,3 +631,18 @@ if (! function_exists('is_request_secure')) {
         return false;
     }
 }
+
+if (! function_exists('nl2p')) {
+    /**
+     * Wrap blocks of text (delimited by \n) in p tags (similar to nl2br).
+     *
+     * @param string $text
+     * @return string
+     */
+    function nl2p($text) {
+        $parts = explode("\n", $text);
+        $result = '<p>'.implode('</p><p>', $parts).'</p>';
+        // Remove empty paragraphs
+        return str_replace('<p></p>', '', $result);
+    }
+}
diff --git a/resources/views/admin/update.blade.php b/resources/views/admin/update.blade.php
index caf2121f..aae1975c 100644
--- a/resources/views/admin/update.blade.php
+++ b/resources/views/admin/update.blade.php
@@ -47,7 +47,7 @@
                                 <tr>
                                     <td class="key">{{ trans('admin.update.info.change-log.text') }}</td>
                                     <td class="value">
-                                        {!! nl2br($info['release_note']) ?: trans('admin.update.info.change-log.empty') !!}
+                                        {!! nl2p($info['release_note']) ?: trans('admin.update.info.change-log.empty') !!}
                                     </td>
                                 </tr>
                                 <tr>
@@ -104,7 +104,7 @@
                         <h3 class="box-title">{{ trans('admin.update.cautions.title') }}</h3>
                     </div><!-- /.box-header -->
                     <div class="box-body">
-                        <p>{!! nl2br(trans('admin.update.cautions.text')) !!}</p>
+                        {!! nl2p(trans('admin.update.cautions.text')) !!}
                     </div><!-- /.box-body -->
                 </div>
             </div>
diff --git a/resources/views/errors/exception.blade.php b/resources/views/errors/exception.blade.php
index 0a0aede4..7cf38f6d 100644
--- a/resources/views/errors/exception.blade.php
+++ b/resources/views/errors/exception.blade.php
@@ -9,6 +9,6 @@
 
 <p>{{ $message }}</p>
 
-<p>{!! nl2br(trans('errors.exception.message')) !!}</p>
+{!! nl2p(trans('errors.exception.message')) !!}
 
 @endsection
diff --git a/resources/views/setup/updates/welcome.blade.php b/resources/views/setup/updates/welcome.blade.php
index 4c9a8b13..db5ab1ed 100644
--- a/resources/views/setup/updates/welcome.blade.php
+++ b/resources/views/setup/updates/welcome.blade.php
@@ -6,7 +6,7 @@
 @include('setup.wizard.language')
 </h1>
 
-<p>{!! nl2br(trans('setup.updates.welcome.text', ['version' => config('app.version')])) !!}</p>
+{!! nl2p(trans('setup.updates.welcome.text', ['version' => config('app.version')])) !!}
 
 <form method="post" action="" novalidate="novalidate">
     <p class="step">
diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php
index ea79d57d..ba05f8da 100644
--- a/resources/views/user/index.blade.php
+++ b/resources/views/user/index.blade.php
@@ -113,7 +113,7 @@
             </div>
             <div class="modal-body">
                 <?php list($from, $to) = explode(',', Option::get('sign_score')); ?>
-                {!! nl2br(trans('user.score-intro.introduction', [
+                {!! nl2p(trans('user.score-intro.introduction', [
                     'initial_score' => option('user_initial_score'),
                     'score-from'    => $from,
                     'score-to'      => $to,
diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php
index 9ba93b4e..1cf7b5d7 100644
--- a/resources/views/user/profile.blade.php
+++ b/resources/views/user/profile.blade.php
@@ -119,7 +119,7 @@
                 <h4 class="modal-title">{{ trans('user.profile.delete.modal-title') }}</h4>
             </div>
             <div class="modal-body">
-                {!! nl2br(trans('user.profile.delete.modal-notice')) !!}
+                {!! nl2p(trans('user.profile.delete.modal-notice')) !!}
                 <br />
                 <input type="password" class="form-control" id="password" placeholder="{{ trans('user.profile.delete.password') }}">
                 <br />