diff --git a/include/profile_advanced.php b/include/profile_advanced.php
index 8dfb1beecc..05fd56d023 100644
--- a/include/profile_advanced.php
+++ b/include/profile_advanced.php
@@ -79,10 +79,13 @@ function advanced_profile(&$a) {
 		if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
 
 		if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
-
+		
+		if ($a->profile['uid'] == local_user())
+      $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
+		
         return replace_macros($tpl, array(
-            '$title' => t('Profile'),
-            '$profile' => $profile,
+          '$title' => t('Profile'),
+          '$profile' => $profile
         ));
     }
 
diff --git a/mod/profiles.php b/mod/profiles.php
index 7903b8b604..423804437a 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -648,14 +648,13 @@ function profiles_content(&$a) {
 			'$cr_prof' => t('Create a new profile using these settings'),
 			'$cl_prof' => t('Clone this profile'),
 			'$del_prof' => t('Delete this profile'),
-			'$lbl_basic_section' => t('Edit basic information'),
-			'$lbl_picture_section' => t('Edit profile picture'),
-			'$lbl_location_section' => t('Edit location'),
-			'$lbl_contacting_section' => t('Edit contacting information'),
-			'$lbl_status_section' => t('Edit status information'),
-			'$lbl_about_section' => t('Edit additional information'),
-			'$lbl_interests_section' => t('Edit interests'),
-			'$lbl_keywords_section' => t('Edit keywords'),
+			'$lbl_basic_section' => t('Basic information'),
+			'$lbl_picture_section' => t('Profile picture'),
+			'$lbl_location_section' => t('Location'),
+			'$lbl_preferences_section' => t('Preferences'),
+			'$lbl_status_section' => t('Status information'),
+			'$lbl_about_section' => t('Additional information'),
+			'$lbl_interests_section' => t('Interests'),
 			'$lbl_profile_photo' => t('Upload Profile Photo'),
 			'$lbl_profname' => t('Profile Name:'),
 			'$lbl_fullname' => t('Your Full Name:'),