diff --git a/Changelog b/Changelog
index 462bfec20..e9f4c250d 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2017-10-17 DariusIII
+	* Fix: Fix sending of contact form when not logged in
 	* Chg: Update composer.lock
 	* Fix: Fix wrong template used for password reset
 	* Fix: Wrong model used in getRoleCategoryExclusion function
diff --git a/public/themes/Gentele/basepage.tpl b/public/themes/Gentele/basepage.tpl
index 1192c78e9..6e216f0b5 100755
--- a/public/themes/Gentele/basepage.tpl
+++ b/public/themes/Gentele/basepage.tpl
@@ -59,8 +59,9 @@
 				</div>
 				<div class="clearfix"></div>
 				<!-- menu profile quick info -->
+				{if $loggedin == "true"}
 				<div class="profile">
-					{if $loggedin == "true"}
+
 						<div class="profile_pic">
 							<img src="{$smarty.const.WWW_THEMES}/shared/images/userimage.png" alt="User Image"
 								 class="img-circle profile_img">
@@ -69,8 +70,8 @@
 							<span>Welcome,</span>
 							<h2>{$userdata.username}</h2>
 						</div>
-					{/if}
 				</div>
+				{/if}
 				<!-- /menu profile quick info -->
 				<br/>
 				<div class="clearfix"></div>
@@ -109,12 +110,11 @@
 								</li>
 							{/if}
 							<div class="clearfix"></div>
+							{if $loggedin == "true"}
 							<li><a><i class="fa fa-edit"></i> Articles & Links <span class="fa fa-chevron-down"></span></a>
+
 								<ul class="nav child_menu" style="display: none">
-									<li><a href="{$smarty.const.WWW_TOP}/contact-us"><i
-													class="fa fa-envelope-o"></i><span> Contact</span> <span
-													class="fa arrow"></span></a></li>
-									{if $loggedin == "true"}
+
 										<li><a href="{$smarty.const.WWW_TOP}/forum"><i class="fa fa-forumbee"></i> Forum</a>
 										</li>
 										<li><a href="{$smarty.const.WWW_TOP}/search"><i class="fa fa-search"></i> Search</a>
@@ -123,16 +123,17 @@
 												Feeds</a></li>
 										<li><a href="{$smarty.const.WWW_TOP}/apihelp"><i class="fa fa-cloud"></i>
 												API</a></li>
-									{/if}
 								</ul>
 								<div class="clearfix"></div>
-								{if $loggedin == "true"}
 							<li><a href="{$smarty.const.WWW_TOP}/logout"><i
 											class="fa fa-unlock"></i><span> Sign Out</span></a></li>
 							{else}
 							<li><a href="{$smarty.const.WWW_TOP}/login"><i class="fa fa-lock"></i><span> Sign In</span></a>
 							</li>
 							{/if}
+							<li><a href="{$smarty.const.WWW_TOP}/contact-us"><i
+											class="fa fa-envelope-o"></i><span> Contact</span> <span
+											class="fa arrow"></span></a></li>
 						</ul>
 					</div>
 				</div>
@@ -140,6 +141,7 @@
 			</div>
 		</div>
 		<!-- top navigation -->
+		{if $loggedin == "true"}
 		<div class="top_nav">
 			<div class="nav_menu">
 				<nav class="" role="navigation">
@@ -150,6 +152,7 @@
 				</nav>
 			</div>
 		</div>
+		{/if}
 		<!-- /top navigation -->
 
 		<!-- page content -->
diff --git a/public/themes/Gentele/headermenu.tpl b/public/themes/Gentele/headermenu.tpl
index 8301e28d3..55ed67aa8 100755
--- a/public/themes/Gentele/headermenu.tpl
+++ b/public/themes/Gentele/headermenu.tpl
@@ -1,6 +1,5 @@
 <div id="menucontainer" xmlns="http://www.w3.org/1999/html">
 	<div class="collapse navbar-collapse nav navbar-nav top-menu">
-		{if $loggedin == "true"}
 			{if isset($userdata)}
 				{foreach $parentcatlist as $parentcat}
 					{if $parentcat.id == {$catClass::TV_ROOT}}
@@ -204,7 +203,8 @@
 					{/if}
 					{if $parentcat.id === "0"}
 						<li class="nav-parent">
-							<a href="#" data-toggle="dropdown" data-hover="dropdown" data-close-others="true" data-delay="30">
+							<a href="#" data-toggle="dropdown" data-hover="dropdown" data-close-others="true"
+							   data-delay="30">
 								<i class="fa fa-bolt"></i> Other<i class="fa fa-angle-down"></i></a>
 							<ul class="dropdown-menu">
 								<li><a href="{$smarty.const.WWW_TOP}/browse?t={$catClass::OTHER_ROOT}">Other</a></li>
@@ -238,8 +238,7 @@
 					</form>
 				</li>
 			</ul>
-			<!-- End If logged in -->
-		{/if}
+
 		<li class="nav-parent">
 			<ul class="nav navbar">
 				<li class="">