diff --git a/mod/connedit.php b/mod/connedit.php
index 2719b7732..198a66b56 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -1,5 +1,11 @@
 <?php
 
+/* @file connedit.php
+ * @brief In this file the connection-editor form is generated and evaluated.
+ *
+ *
+ */
+
 require_once('include/Contact.php');
 require_once('include/socgraph.php');
 require_once('include/contact_selectors.php');
@@ -8,6 +14,11 @@ require_once('include/contact_widgets.php');
 require_once('include/zot.php');
 require_once('include/widgets.php');
 
+/* @brief Initialize the connection-editor
+ *
+ *
+ */
+
 function connedit_init(&$a) {
 
 	if(! local_user())
@@ -31,6 +42,10 @@ function connedit_init(&$a) {
 
 }
 
+/* @brief Evaluate posted values and set changes
+ *
+ */
+
 function connedit_post(&$a) {
 
 	if(! local_user())
@@ -81,7 +96,7 @@ function connedit_post(&$a) {
 		if(strpos($k,'perms_') === 0) {
 			$abook_my_perms += $v;
 		}
-	}			
+	}
 
 	$abook_flags = $orig_record[0]['abook_flags'];
 	$new_friend = false;
@@ -103,6 +118,15 @@ function connedit_post(&$a) {
 		intval(local_user())
 	);
 
+	if($orig_record[0]['abook_profile'] != $profile_id) { //Update profile photo permissions
+
+                logger('As a new profile was assigned updateing profile photos');
+                require_once('mod/profile_photo.php');
+                profile_photo_set_profile_perms($profile_id);
+
+        }
+
+
 	if($r)
 		info( t('Connection updated.') . EOL);
 	else
@@ -114,7 +138,7 @@ function connedit_post(&$a) {
 	}
 
 	if($new_friend) {
-		$channel = $a->get_channel();		
+		$channel = $a->get_channel();
 		$default_group = $channel['channel_default_group'];
 		if($default_group) {
 			require_once('include/group.php');
@@ -158,6 +182,11 @@ function connedit_post(&$a) {
 
 }
 
+/* @brief Clone connection
+ *
+ *
+ */
+
 function connedit_clone(&$a) {
 
 		if(! $a->poi)
@@ -171,6 +200,10 @@ function connedit_clone(&$a) {
 		build_sync_packet(0 /* use the current local_user */, array('abook' => array($clone)));
 }
 
+/* @brief Generate content of connection edit page
+ *
+ *
+ */
 
 function connedit_content(&$a) {
 
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index ab7c3b12f..c587b9606 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -18,7 +18,7 @@ function profile_photo_set_profile_perms($profileid = '') {
 	$allowcid = '';
 	if (x($profileid)) {
 
-		$r = q("SELECT photo, profile_guid, id, is_default, uid  FROM profile WHERE profile.id = %d LIMIT 1", intval($profileid));
+		$r = q("SELECT photo, profile_guid, id, is_default, uid  FROM profile WHERE profile.id = %d OR profile.profile_guid = '%s' LIMIT 1", intval($profileid), dbesc($profileid));
 
 	} else {
 
@@ -53,6 +53,13 @@ function profile_photo_set_profile_perms($profileid = '') {
 	return;
 }
 
+/* @brief Initalize the profile-photo edit view
+ *
+ * @param $a Current application
+ * @return void
+ *
+ */
+
 function profile_photo_init(&$a) {
 
 	if(! local_user()) {
@@ -64,6 +71,12 @@ function profile_photo_init(&$a) {
 
 }
 
+/* @brief Evaluate posted values
+ *
+ * @param $a Current application
+ * @return void
+ *
+ */
 
 function profile_photo_post(&$a) {
 
@@ -235,6 +248,13 @@ function profile_photo_post(&$a) {
 	
 }
 
+/* @brief Generate content of profile-photo view
+ *
+ * @param $a Current application
+ * @return void
+ *
+ */
+
 
 if(! function_exists('profile_photo_content')) {
 function profile_photo_content(&$a) {
@@ -367,6 +387,14 @@ function profile_photo_content(&$a) {
 	return; // NOTREACHED
 }}
 
+/* @brief Generate the UI for photo-cropping
+ *
+ * @param $a Current application
+ * @param $ph Photo-Factory
+ * @return void
+ *
+ */
+
 
 if(! function_exists('profile_photo_crop_ui_head')) {
 function profile_photo_crop_ui_head(&$a, $ph){