diff --git a/README.md b/README.md
index 31578cc..d9a1478 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Fast and small content management system written in PHP!
 
 
 ## Links
-- [Site](http://punbb.informer.com/wiki/)
+- [Site](http://monstra.org)
 - [Forum](http://forum.monstra.org)
 - [Documentation](http://monstra.org/documentation)
 - [Github Repository](https://github.com/Awilum/monstra-cms)
diff --git a/monstra/engine/shortcodes.php b/monstra/engine/shortcodes.php
index 2454489..74ab6d0 100644
--- a/monstra/engine/shortcodes.php
+++ b/monstra/engine/shortcodes.php
@@ -180,7 +180,8 @@
                 }
             }
              
-            return $prefix . call_user_func(Shortcode::$shortcode_tags[$shortcode], $attributes, $matches[5], $shortcode) . $suffix;
+            // Check if this shortcode realy exists then call user function else return empty string
+            return (isset(Shortcode::$shortcode_tags[$shortcode])) ? $prefix . call_user_func(Shortcode::$shortcode_tags[$shortcode], $attributes, $matches[5], $shortcode) . $suffix : '';
         }
 
 }
\ No newline at end of file
diff --git a/monstra/helpers/text.php b/monstra/helpers/text.php
index 7ffcbbe..4fad4b8 100644
--- a/monstra/helpers/text.php
+++ b/monstra/helpers/text.php
@@ -230,6 +230,10 @@
         /**
          * Add's _1 to a string or increment the ending number to allow _2, _3, etc
          *
+         *  <code>
+         *      $str = Text::increment($str);
+         *  </code>
+         *
          * @param   string   $str       String to increment
          * @param   integer  $first     Start with
          * @param   string   $separator Separator
diff --git a/plugins/box/system/system.admin.php b/plugins/box/system/system.admin.php
index b96774c..42f809c 100755
--- a/plugins/box/system/system.admin.php
+++ b/plugins/box/system/system.admin.php
@@ -58,7 +58,7 @@
 
                 // Get all pages
                 $pages_array = array();
-                $pages_list = $pages->select('[slug!="error404" and parent="" and status="published" and access="public"]');
+                $pages_list = $pages->select('[slug!="error404" and parent="" and status="published"]');
                 foreach ($pages_list as $page) {
                     $pages_array[$page['slug']] = Html::toText($page['title']);
                 }
diff --git a/plugins/box/users/languages/it.lang.php b/plugins/box/users/languages/it.lang.php
index 743cee0..a351b56 100644
--- a/plugins/box/users/languages/it.lang.php
+++ b/plugins/box/users/languages/it.lang.php
@@ -33,7 +33,7 @@
             'Old password' => 'Vecchia password',
             'New password' => 'Nuova password',
             'Welcome' => 'Benvenuto',
-            'Wrong <b>login</b> or <b>password</b>' => '<b>Login</b> o <b>password</b> errata',
+            'Wrong <b>username</b> or <b>password</b>' => '<b>username</b> o <b>password</b> errata',
             'Your changes have been saved.' => 'Le modifiche sono state salvate.',
             'New user have been registered.' => 'Nuovo utente è stato registrato.',
             'Captcha' => 'Codice captcha',
diff --git a/plugins/box/users/languages/ru.lang.php b/plugins/box/users/languages/ru.lang.php
index 839b539..d5261ff 100644
--- a/plugins/box/users/languages/ru.lang.php
+++ b/plugins/box/users/languages/ru.lang.php
@@ -33,7 +33,7 @@
             'Old password' => 'Старый пароль',
             'New password' => 'Новый пароль',
             'Welcome' => 'Добро пожаловать',
-            'Wrong <b>login</b> or <b>password</b>' => 'Неправильный <b>логин</b> или <b>пароль</b>',
+            'Wrong <b>username</b> or <b>password</b>' => 'Неправильный <b>логин</b> или <b>пароль</b>',
             'Your changes have been saved.' => 'Ваши изменения были сохранены.',
             'New user have been registered.' => 'Новый пользователь был зарегистрирован.',
             'Captcha' => 'Каптча',
diff --git a/plugins/box/users/languages/uk.lang.php b/plugins/box/users/languages/uk.lang.php
index 6a0d24b..2fae7c5 100644
--- a/plugins/box/users/languages/uk.lang.php
+++ b/plugins/box/users/languages/uk.lang.php
@@ -33,7 +33,7 @@
             'Old password' => 'Старий пароль',
             'New password' => 'Новий пароль',
             'Welcome' => 'Ласкаво просимо',
-            'Wrong <b>login</b> or <b>password</b>' => 'Неправильний <b>логін</b> або <b>пароль</b>',
+            'Wrong <b>username</b> or <b>password</b>' => 'Неправильний <b>логін</b> або <b>пароль</b>',
             'Your changes have been saved.' => 'Ваші зміни були збережені.',
             'New user have been registered.' => 'Новий користувач був зареєстрований.',
             'Captcha' => 'Каптча',
diff --git a/plugins/box/users/users.plugin.php b/plugins/box/users/users.plugin.php
index 83f45a1..daf9f9e 100644
--- a/plugins/box/users/users.plugin.php
+++ b/plugins/box/users/users.plugin.php
@@ -393,11 +393,11 @@
                                     Session::set('user_role', (string)$user['role']);
                                     Request::redirect(Site::url().'users/'.Session::get('user_id'));
                                 } else {
-                                    Notification::setNow('error', __('Wrong <b>login</b> or <b>password</b>', 'users'));  
+                                    Notification::setNow('error', __('Wrong <b>username</b> or <b>password</b>', 'users'));  
                                 }
                             } 
                         } else {
-                            Notification::setNow('error', __('Wrong <b>login</b> or <b>password</b>', 'users'));  
+                            Notification::setNow('error', __('Wrong <b>username</b> or <b>password</b>', 'users'));  
                         }
 
                     } else { die('csrf detected!'); }