diff --git a/depends.txt b/depends.txt
deleted file mode 100644
index 7df2c28..0000000
--- a/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-email
diff --git a/description.txt b/description.txt
deleted file mode 100644
index e840629..0000000
--- a/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Allows players to report misconduct or bugs using /report.
diff --git a/init.lua b/init.lua
index a544294..8e4650d 100644
--- a/init.lua
+++ b/init.lua
@@ -1,36 +1,96 @@
+local S = minetest.get_translator("report")
+
+local storage = minetest.get_mod_storage()
+assert(storage, "mod_storage is required")
+
+local function get_modo_list()
+	local store = storage:get_string("report")
+	if store then
+		return minetest.deserialize(store) or {}
+	end
+	return nil
+end
+
+local function is_known_modo(name)
+	for _, modo in ipairs(get_modo_list()) do
+		if modo == name then
+			return true
+		end
+	end
+	return false
+end
+
+minetest.register_on_joinplayer(function(player)
+	-- Get player privs
+	local player_name = player:get_player_name()
+	local is_modo = minetest.check_player_privs(player_name, {kick = true, ban = true})
+
+	-- Is player a known moderator?
+	local known = is_known_modo(player_name)
+
+	-- Add or remove the player to/from moderators list
+	if not known and is_modo then
+		local modos = get_modo_list()
+		table.insert(modos, player_name)
+		storage:set_string("report", minetest.serialize(modos))
+	elseif known and not is_modo then
+		local modos = get_modo_list()
+		for i, modo in ipairs(modos) do
+			if modo == player_name then
+				table.remove(modos, i)
+				storage:set_string("report", minetest.serialize(modos))
+				break
+			end
+		end
+	end
+end)
+
 minetest.register_chatcommand("report", {
+	description = S("Send a report to moderators. '/report modos_list' to get the list of moderators."),
+	params = "<msg>",
 	func = function(name, param)
 		param = param:trim()
 		if param == "" then
-			return false, "Please add a message to your report. " ..
-				"If it's about (a) particular player(s), please also include their name(s)."
+			return false, S("Please write a message for the report. If it's about one or several players in particular, please give their name.")
+		end
+		if param == "modos_list" then
+			return true, S("Moderators list: @1", table.concat(get_modo_list(), ", "))
 		end
 		local _, count = string.gsub(param, " ", "")
 		if count == 0 then
-			minetest.chat_send_player(name, "If you're reporting a player, " ..
-				"you should also include a reason why. (Eg: swearing, sabotage)")
+			minetest.chat_send_player(name, S("If you are reporting a player's attitude, you should also say why. (Ex: insult, sabotage)"))
 		end
 
 		-- Send to online moderators / admins
 		-- Get comma separated list of online moderators and admins
-		local mods = {}
+		local modos_online = {}
 		for _, player in pairs(minetest.get_connected_players()) do
 			local toname = player:get_player_name()
-			if minetest.check_player_privs(toname, {kick = true, ban = true}) then
-				table.insert(mods, toname)
-				minetest.chat_send_player(toname, "-!- " .. name .. " reported: " .. param)
+			if is_known_modo(toname) then
+				table.insert(modos_online, toname)
+				minetest.chat_send_player(toname, S("-!- @1 has reported: @2", name, param))
 			end
 		end
 
-		if #mods > 0 then
-			mod_list = table.concat(mods, ", ")
-			email.send_mail(name, minetest.setting_get("name"),
-				"Report: " .. param .. " (mods online: " .. mod_list .. ")")
-			return true, "Reported. Moderators currently online: " .. mod_list
+		local admin = minetest.setting_get("name")
+
+		if #modos_online > 0 then
+			local mod_list = table.concat(modos_online, ", ")
+			email.send_mail(name, admin, S("Report: @1 (online moderator(s): @2)", param, mod_list))
+			for _, modo in ipairs(get_modo_list()) do
+				if modo ~= admin then
+					email.send_mail(name, modo, S("Report: @1 (online moderator(s): @2)", param, mod_list))
+				end
+			end
+			return true, S("Reported. Online moderator(s): @1", mod_list)
 		else
-			email.send_mail(name, minetest.setting_get("name"),
-				"Report: " .. param .. " (no mods online)")
-			return true, "Reported. We'll get back to you."
+			email.send_mail(name, admin, S("Report: @1 (no online moderator)", param))
+			for _, modo in ipairs(get_modo_list()) do
+				if modo ~= admin then
+					email.send_mail(name, modo, S("Report: @1 (no online moderator)", param))
+				end
+			end
+			return true, S("Reported. We will get back to you.")
 		end
 	end
 })
diff --git a/locale/report.fr.tr b/locale/report.fr.tr
new file mode 100644
index 0000000..76b0bca
--- /dev/null
+++ b/locale/report.fr.tr
@@ -0,0 +1,10 @@
+# textdomain:report
+Send a report to moderators. '/report modos_list' to get the list of moderators.=Envoie un rapport aux modérateurs. '/report modos_list' pour obtenir la liste des modérateurs.
+Please write a message for the report. If it's about one or several players in particular, please give their name.=Veuillez écrire un message pour le rapport. Si il s'agit d'un ou plusieurs joueurs en particulier, veuillez aussi indiquer leur nom.
+Moderators list: @1=Liste de modérateurs : @1
+If you are reporting a player's attitude, you should also say why. (Ex: insult, sabotage)=Si vous rapportez l'attitude d'un joueur, vous devriez aussi dire quelle en est la raison. (Ex: insulte, sabotage)
+-!- @1 has reported: @2=-!- @1 a rapporté : @2
+Report: @1 (online moderator(s): @2)=Rapport : @1 (moderateur(s) connecté(s) : @2)
+Reported. Online moderator(s): @1=Rapporté. Moderateur(s) connecté(s) : @1
+Report: @1 (no online moderator)=Rapport : @1 (pas de modérateur connecté)
+Reported. We will get back to you.=Rapporté. On reviendra vers vous.
diff --git a/locale/template.txt b/locale/template.txt
new file mode 100644
index 0000000..053a04e
--- /dev/null
+++ b/locale/template.txt
@@ -0,0 +1,10 @@
+# textdomain:report
+Send a report to moderators. '/report modos_list' to get the list of moderators.=
+Please write a message for the report. If it's about one or several players in particular, please give their name.=
+Moderators list: @1=
+If you are reporting a player's attitude, you should also say why. (Ex: insult, sabotage)=
+-!- @1 has reported: @2=
+Report: @1 (online moderator(s): @2)=
+Reported. Online moderator(s): @1=
+Report: @1 (no online moderator)=
+Reported. We will get back to you.=
diff --git a/mod.conf b/mod.conf
new file mode 100644
index 0000000..48b5baf
--- /dev/null
+++ b/mod.conf
@@ -0,0 +1,4 @@
+name = report
+title = Report
+description = Allows players to report misconduct or bugs using /report.
+depends = email