diff --git a/UUID-conversion.md b/UUID-conversion.md
index 8957a31..6309cac 100644
--- a/UUID-conversion.md
+++ b/UUID-conversion.md
@@ -1,14 +1,20 @@
-## Overview
+# Overview
 This was added in version 2.10. UUID conversion allows you to switch between different methods of UUID storage on your server. 
 
-## Modes
-#### offline
-Will use the same UUID as an offline-mode server. i.e. The UUID will be based on the playername (case sensitive)
-#### lower
+## Offline - Mode
+Will use the same UUID as an offline-mode server. The UUID will be based on the playername (case sensitive).
+## Lower - Mode
 Offline mode but case insensitive, as it gets the UUID from the lowercase username.
-#### online
-Use online-mode UUID provided by mojang. This mode will not work properly if you are using a pre-UUID version of Bukkit, or your server is set to offline mode.
+## Online - Mode
+Use online-mode UUID provided by mojang.
+
+> **Warning:** This mode will not work properly if you are using a pre-UUID version of Bukkit, or your server is set to offline mode. Please check your `server.properties` to be secure.
+
+> **Info:** If you use a proxy server (e.g. BungeeCord or Waterfall) follow these documentation to forward the player-UUID. Then the PlotSquared Online-UUID-Mode works also fine.
+
+# Usage
+A command is required to be executed in order to convert.
+
+> **Warning:** You are strongly advised to backup your database before a conversion. Plots may be lost if something goes wrong!
 
-## Usage
-A command is required to be executed in order to convert. You are urged to backup your database before conversion, as plots may be lost if something goes wrong:
 `/plot uuidconvert <mode>`
\ No newline at end of file