diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
index 9ed829a0..8cc48542 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
@@ -441,11 +441,13 @@ public void onPlayerJoin(PlayerJoinEvent event) {
                     + "Fire spread is currently globally disabled for this world.");
         }
         
-        if (plugin.inGroup(player, "wg-invincible")) {
+        if (plugin.inGroup(player, "wg-invincible")
+                || plugin.hasPermission(player, "worldguard.login.god")) {
             cfg.enableGodMode(player);
         }
         
-        if (plugin.inGroup(player, "wg-amphibious")) {
+        if (plugin.inGroup(player, "wg-amphibious")
+                || plugin.hasPermission(player, "worldguard.login.amphibious")) {
             cfg.enableAmphibiousMode(player);
         }
     }