diff --git a/webui/config.php b/webui/config.php
index b645a2a1..af866162 100644
--- a/webui/config.php
+++ b/webui/config.php
@@ -167,7 +167,7 @@ $config['USE_EMAIL_AS_USERNAME'] = 1;
 $config['LDAP_IMPORT_MINIMUM_NUMBER_OF_USERS_TO_HEALTH_OK'] = 100;
 
 
-define('PILER_LOGIN_HELPER_PLACEHOLDER', 'PILER_COMMENT_FOR_PROPER_LOGIN_SO_THIS_CAN_BE_ANYTHING_JUST_BE_IT_SOMETHING_LIKE_A_UNIQUE_VALUE');
+$config['PILER_LOGIN_HELPER_PLACEHOLDER'] = 'PILER_COMMENT_FOR_PROPER_LOGIN_SO_THIS_CAN_BE_ANYTHING_JUST_BE_IT_SOMETHING_LIKE_A_UNIQUE_VALUE';
 
 
 $config['SIZE_X'] = 430;
diff --git a/webui/controller/login/login.php b/webui/controller/login/login.php
index 25d4e7e7..547a1a4c 100644
--- a/webui/controller/login/login.php
+++ b/webui/controller/login/login.php
@@ -51,14 +51,7 @@ class ControllerLoginLogin extends Controller {
                exit;
             }
 
-            if(isset($_POST['relocation']) && $_POST['relocation']) {
-               header("Location: " . SITE_URL . $_POST['relocation']);
-            } else {
-               header("Location: " . SITE_URL . "search.php");
-            }
-
-            //header("Location: " . SITE_URL . "search.php");
-
+            header("Location: " . SITE_URL . "search.php");
             exit;
          }
 
diff --git a/webui/view/theme/default/templates/common/layout-audit.tpl b/webui/view/theme/default/templates/common/layout-audit.tpl
index eacf4e0f..469a5b77 100644
--- a/webui/view/theme/default/templates/common/layout-audit.tpl
+++ b/webui/view/theme/default/templates/common/layout-audit.tpl
@@ -5,9 +5,9 @@
     <title><?php print $title; ?> | <?php print SITE_NAME; ?> <?php if(PROVIDED_BY) { print PROVIDED_BY; } ?></title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <meta http-equiv="Content-Language" content="en" />
-    <meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" />
-    <meta name="description" content="<?php print SITE_DESCRIPTION; ?>" />
-    <meta name="author" content="<?php print PROVIDED_BY; ?>" />
+    <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
+    <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
+    <?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
     <meta name="rating" content="general" />
     <meta name="robots" content="all" />
 
diff --git a/webui/view/theme/default/templates/common/layout-email.tpl b/webui/view/theme/default/templates/common/layout-email.tpl
index 0daac933..d11f4a67 100644
--- a/webui/view/theme/default/templates/common/layout-email.tpl
+++ b/webui/view/theme/default/templates/common/layout-email.tpl
@@ -5,9 +5,9 @@
    <title><?php print $title; ?> | <?php print SITE_NAME; ?> <?php if(PROVIDED_BY) { print PROVIDED_BY; } ?></title>
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
    <meta http-equiv="Content-Language" content="en" />
-   <meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" />
-   <meta name="description" content="<?php print SITE_DESCRIPTION; ?>" />
-   <meta name="author" content="<?php print PROVIDED_BY; ?>" />
+   <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
+   <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
+   <?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
    <meta name="rating" content="general" />
    <meta name="robots" content="all" />
 
diff --git a/webui/view/theme/default/templates/common/layout-search.tpl b/webui/view/theme/default/templates/common/layout-search.tpl
index b50e2eee..ac19f6bd 100644
--- a/webui/view/theme/default/templates/common/layout-search.tpl
+++ b/webui/view/theme/default/templates/common/layout-search.tpl
@@ -5,9 +5,9 @@
    <title><?php print $title; ?> | <?php print SITE_NAME; ?> <?php if(PROVIDED_BY) { print PROVIDED_BY; } ?></title>
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
    <meta http-equiv="Content-Language" content="en" />
-   <meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" />
-   <meta name="description" content="<?php print SITE_DESCRIPTION; ?>" />
-   <meta name="author" content="<?php print PROVIDED_BY; ?>" />
+   <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
+   <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
+   <?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
    <meta name="rating" content="general" />
    <meta name="robots" content="all" />
 
diff --git a/webui/view/theme/default/templates/common/layout.tpl b/webui/view/theme/default/templates/common/layout.tpl
index c173f7c1..f0e6c7ae 100644
--- a/webui/view/theme/default/templates/common/layout.tpl
+++ b/webui/view/theme/default/templates/common/layout.tpl
@@ -5,9 +5,9 @@
     <title><?php print $title; ?> | <?php print SITE_NAME; ?> <?php if(PROVIDED_BY) { print PROVIDED_BY; } ?></title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <meta http-equiv="Content-Language" content="en" />
-    <meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" />
-    <meta name="description" content="<?php print SITE_DESCRIPTION; ?>" />
-    <meta name="author" content="<?php print PROVIDED_BY; ?>" />
+    <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
+    <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
+    <?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
     <meta name="rating" content="general" />
     <meta name="robots" content="all" />
 
diff --git a/webui/view/theme/default/templates/login/login.tpl b/webui/view/theme/default/templates/login/login.tpl
index fdff9b5e..871f28e4 100644
--- a/webui/view/theme/default/templates/login/login.tpl
+++ b/webui/view/theme/default/templates/login/login.tpl
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <title><?php print SITE_NAME; ?> | <?php print PROVIDED_BY; ?></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="<?php print SITE_DESCRIPTION; ?>">
-    <meta name="author" content="<?php print PROVIDED_BY; ?>">
+    <?php if(SITE_KEYWORDS) { ?><meta name="keywords" content="<?php print SITE_KEYWORDS; ?>" /><?php } ?>
+    <?php if(SITE_DESCRIPTION) { ?><meta name="description" content="<?php print SITE_DESCRIPTION; ?>" /><?php } ?>
+    <?php if(PROVIDED_BY) { ?><meta name="author" content="<?php print PROVIDED_BY; ?>" /><?php } ?>
 
     <link href="/view/theme/default/assets/css/metro-bootstrap.css" rel="stylesheet">