diff --git a/classes/User.php b/classes/User.php
index 88c4ec7..89baf59 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -34,6 +34,8 @@ public function getProLitterisSurname($userId){
 	}
 
 	public function profile_fields($user){
+
+		if(!user_can($user, "edit_posts")) return;
 		$keyId = Plugin::USER_META_PRO_LITTERIS_ID;
 		$keyName = Plugin::USER_META_PRO_LITTERIS_NAME;
 		$keySurname = Plugin::USER_META_PRO_LITTERIS_SURNAME;
@@ -86,19 +88,21 @@ class="regular-text"
 	}
 
 	public function save($user_id){
-		
+
 		if ( !current_user_can( 'edit_user', $user_id ) )
 			return;
 
 		if(isset($_POST[Plugin::USER_META_PRO_LITTERIS_ID]) && !empty($_POST[Plugin::USER_META_PRO_LITTERIS_ID])){
 			update_user_meta( $user_id, Plugin::USER_META_PRO_LITTERIS_ID, intval($_POST[Plugin::USER_META_PRO_LITTERIS_ID]) );
+			update_user_meta( $user_id, Plugin::USER_META_PRO_LITTERIS_NAME, sanitize_text_field($_POST[Plugin::USER_META_PRO_LITTERIS_NAME]) );
+			update_user_meta( $user_id, Plugin::USER_META_PRO_LITTERIS_SURNAME, sanitize_text_field($_POST[Plugin::USER_META_PRO_LITTERIS_SURNAME]) );
 		} else {
 			delete_user_meta($user_id, Plugin::USER_META_PRO_LITTERIS_ID );
+			delete_user_meta( $user_id, Plugin::USER_META_PRO_LITTERIS_NAME);
+			delete_user_meta( $user_id, Plugin::USER_META_PRO_LITTERIS_SURNAME);
 		}
 
-		update_user_meta( $user_id, Plugin::USER_META_PRO_LITTERIS_NAME, sanitize_text_field($_POST[Plugin::USER_META_PRO_LITTERIS_NAME]) );
-		update_user_meta( $user_id, Plugin::USER_META_PRO_LITTERIS_SURNAME, sanitize_text_field($_POST[Plugin::USER_META_PRO_LITTERIS_SURNAME]) );
 	}
 
 
-}
\ No newline at end of file
+}