diff --git a/public/index.php b/public/index.php
index b5960f3e..7a04599d 100644
--- a/public/index.php
+++ b/public/index.php
@@ -98,11 +98,10 @@ if (count(@$_SESSION['last_ip_pop']) == 2) {
   $data = $_SESSION['last_ip_pop'];
   $ip = filter_var($data[0], FILTER_VALIDATE_IP);
   $time = date("l, F jS \a\\t g:i a", $data[1]);
-  $closelink = "<a href='index.php?page=dashboard&clp=1' style='float:right;padding-right:14px;'>Close</a>";
   if (@$_SESSION['AUTHENTICATED'] && $_SESSION['last_ip_pop'][0] !== $user->getCurrentIP()) {
-    $_SESSION['POPUP'][] = array('CONTENT' => "You last logged in from <b>$ip</b> on $time $closelink", 'TYPE' => 'alert alert-warning');
+    $_SESSION['POPUP'][] = array('CONTENT' => "You last logged in from <b>$ip</b> on $time", 'TYPE' => 'alert alert-warning alert-dismissable');
   } else {
-    $_SESSION['POPUP'][] = array('CONTENT' => "You last logged in from <b>$ip</b> on $time $closelink", 'TYPE' => 'alert alert-info');
+    $_SESSION['POPUP'][] = array('CONTENT' => "You last logged in from <b>$ip</b> on $time", 'TYPE' => 'alert alert-info alert-dismissable');
   }
 }
 
diff --git a/public/templates/bootstrap/master.tpl b/public/templates/bootstrap/master.tpl
index 86548d2d..a9befa36 100644
--- a/public/templates/bootstrap/master.tpl
+++ b/public/templates/bootstrap/master.tpl
@@ -42,7 +42,10 @@
     {nocache}
     {if is_array($smarty.session.POPUP|default)}
       {section popup $smarty.session.POPUP}
-      <div class="{$smarty.session.POPUP[popup].TYPE|default:"alert alert-info"}">{$smarty.session.POPUP[popup].CONTENT nofilter}</div>
+      <div class="{$smarty.session.POPUP[popup].TYPE|default:"alert alert-info alert-dismissable"}">
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+        {$smarty.session.POPUP[popup].CONTENT nofilter}
+      </div>
       {/section}
     {/if}
     {/nocache}