diff --git a/lib/mpw/mpw.rb b/lib/mpw/mpw.rb
index c5023e6..3f9986f 100644
--- a/lib/mpw/mpw.rb
+++ b/lib/mpw/mpw.rb
@@ -206,12 +206,16 @@ class MPW
 		end
 
 		@keys[key] = data
+		@password.each_keys { |id| set_password(id, get_password(id)) }
+		@otp_keys.each_keys { |id| set_otp_key(id, get_otp_key(id)) }
 	end
 
 	# Delete a public key
 	# args: key ->  public key to delete
 	def delete_key(key)
 		@keys.delete(key)
+		@password.each_keys { |id| set_password(id, get_password(id)) }
+		@otp_keys.each_keys { |id| set_otp_key(id, get_otp_key(id)) }
 	end
 
 	# Set config