diff --git a/boot.php b/boot.php
index eb3d1b06e3..3bc8d2983d 100644
--- a/boot.php
+++ b/boot.php
@@ -1027,7 +1027,7 @@ function photo_new_resource() {
 
 if(! function_exists('get_uid')) {
 function get_uid() {
-	return ((x($_SESSION,'uid')) ? intval($_SESSION['uid']) : 0) ;
+	return local_user();
 }}
 
 // Take a URL from the wild, prepend http:// if necessary
diff --git a/include/security.php b/include/security.php
index ae161b4a43..1e0107dcca 100644
--- a/include/security.php
+++ b/include/security.php
@@ -1,11 +1,14 @@
 <?php
 
 function can_write_wall(&$a,$owner) {
+
         if((! (local_user())) && (! (remote_user())))
                 return false;
 		$uid = get_uid();
-        if(($uid) && ($uid === $owner))
+
+        if(($uid) && ($uid === $owner)) {
                 return true;
+		}
 
         $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `user`.`uid` = `contact`.`uid` 
 			WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
@@ -16,6 +19,7 @@ function can_write_wall(&$a,$owner) {
 			intval(REL_BUD),
 			intval(PAGE_COMMUNITY)
         );
+
         if(count($r))
                 return true;
         return false;