diff --git a/action.sh b/action.sh
index 6ec1940..98842cc 100755
--- a/action.sh
+++ b/action.sh
@@ -139,6 +139,15 @@ $ATTACHMENT
   rm $MAILTMP;
 }
 
+function notesdelete {  # $1=$USER
+  # Extract Mail part | exclude LEAD and TAIL | delete user
+  sed -n "/$LEAD/,/$TAIL/ p" $NOTES | grep -v "$LEAD\|$TAIL" | sed "/User:[ \t]*$USER$/,+2d" > $NOTESTMP
+  # Put edited part in between $LEAD and $TAIL again
+  sed -i "/$LEAD/,/$TAIL/{ /$LEAD/{p; r $NOTESTMP
+          }; /$TAIL/p; d }" $NOTES
+  rm $NOTESTMP
+}
+
 ## FIRST CHECKS
 if ! $(checkaction "$ACTION"); then
   echo "No valid action chosen"
@@ -213,12 +222,15 @@ if [ "$ACTION" == "changepw" ]; then
     LEAD='## > EMAIL'
     TAIL='## < EMAIL'
     
-    # Extract Mail part | exclude LEAD and TAIL | delete user
-    sed -n "/$LEAD/,/$TAIL/ p" $NOTES | grep -v "$LEAD\|$TAIL" | sed "/User:[ \t]*$USER$/,+2d" > $NOTESTMP
-    # Put edited part in between $LEAD and $TAIL again
-    sed -i "/$LEAD/,/$TAIL/{ /$LEAD/{p; r $NOTESTMP
-            }; /$TAIL/p; d }" $NOTES
-    rm $NOTESTMP
+    ## Extract Mail part | exclude LEAD and TAIL | delete user
+    #sed -n "/$LEAD/,/$TAIL/ p" $NOTES | grep -v "$LEAD\|$TAIL" | sed "/User:[ \t]*$USER$/,+2d" > $NOTESTMP
+    ## Put edited part in between $LEAD and $TAIL again
+    #sed -i "/$LEAD/,/$TAIL/{ /$LEAD/{p; r $NOTESTMP
+            #}; /$TAIL/p; d }" $NOTES
+    #rm $NOTESTMP
+    
+    notesdelete "$USER" 
+    
     # Update datasheet (add new entry in Email section)
     TAIL='## < EMAIL'
     sed -i "/$TAIL/i User:     $USER\nPass:     $PASS\n" $NOTES