diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java
index 567513e..c220c5e 100644
--- a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java
+++ b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java
@@ -293,20 +293,19 @@ public class ResidencePlayerListener implements Listener {
 						return;
 				PermissionGroup group = Residence.getPermissionManager().getGroup(player);
 				if (player.hasPermission("residence.select") || player.hasPermission("residence.create") && !player.isPermissionSet("residence.select")
-						|| group.canCreateResidences() && !player.isPermissionSet("residence.create") && !player.isPermissionSet("residence.select") || resadmin) {
+						|| group.canCreateResidences() && !player.isPermissionSet("residence.create") && !player.isPermissionSet("residence.select") || resadmin)
 					if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
 						Location loc = block.getLocation();
 						Residence.getSelectionManager().placeLoc1(player, loc);
 						player.sendMessage(ChatColor.GREEN + Residence.getLanguage().getPhrase("SelectPoint", Residence.getLanguage().getPhrase("Primary")) + ChatColor.RED + "(" + loc.getBlockX()
 								+ "," + loc.getBlockY() + "," + loc.getBlockZ() + ")" + ChatColor.GREEN + "!");
+						event.setCancelled(true);
 					} else if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
 						Location loc = block.getLocation();
 						Residence.getSelectionManager().placeLoc2(player, loc);
 						player.sendMessage(ChatColor.GREEN + Residence.getLanguage().getPhrase("SelectPoint", Residence.getLanguage().getPhrase("Secondary")) + ChatColor.RED + "(" + loc.getBlockX()
 								+ "," + loc.getBlockY() + "," + loc.getBlockZ() + ")" + ChatColor.GREEN + "!");
 					}
-					event.setCancelled(true);
-				}
 			}
 			if (player.getItemInHand().getTypeId() == Residence.getConfigManager().getInfoToolID())
 				if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
@@ -315,8 +314,7 @@ public class ResidencePlayerListener implements Listener {
 					if (res != null) {
 						Residence.getResidenceManager().printAreaInfo(res, player);
 						event.setCancelled(true);
-					}
-					if (res == null) {
+					} else {
 						event.setCancelled(true);
 						player.sendMessage(Residence.getLanguage().getPhrase("NoResHere"));
 					}