diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandServer.java b/proxy/src/main/java/net/md_5/bungee/command/CommandServer.java
index 327e36b1..d5bb59d8 100644
--- a/proxy/src/main/java/net/md_5/bungee/command/CommandServer.java
+++ b/proxy/src/main/java/net/md_5/bungee/command/CommandServer.java
@@ -30,6 +30,8 @@ public class CommandServer extends Command
         Map<String, ServerInfo> servers = ProxyServer.getInstance().getServers();
         if ( args.length == 0 )
         {
+            player.sendMessage( ProxyServer.getInstance().getTranslation( "current_server" ) + player.getServer().getInfo().getName() );
+
             StringBuilder serverList = new StringBuilder();
             for ( ServerInfo server : servers.values() )
             {
diff --git a/proxy/src/main/resources/messages_en.properties b/proxy/src/main/resources/messages_en.properties
index d27305a1..114a7289 100644
--- a/proxy/src/main/resources/messages_en.properties
+++ b/proxy/src/main/resources/messages_en.properties
@@ -1,14 +1,15 @@
-alert: \u00A75[Alert] 
+alert: \u00a75[Alert] 
 already_connected: You are already connected to the server
-connect_kick: \u00A7cKicked whilst connecting to 
-fallback_kick: \u00A7cCould not connect to default server, please try again later: 
-fallback_lobby: \u00A7cCould not connect to target server, you have been moved to the lobby server
+connect_kick: \u00a7cKicked whilst connecting to 
+current_server: \u00a76You are currently connected to 
+fallback_kick: \u00a7cCould not connect to default server, please try again later: 
+fallback_lobby: \u00a7cCould not connect to target server, you have been moved to the lobby server
 lost_connection: [Proxy] Lost connection to server.
-no_permission: \u00A7cYou do not have permission to execute this command!
-no_server: \u00A7cThe specified server does not exist
-no_server_permission: \u00A7cYou don't have permission to access this server
+no_permission: \u00a7cYou do not have permission to execute this command!
+no_server: \u00a7cThe specified server does not exist
+no_server_permission: \u00a7cYou don't have permission to access this server
 proxy_full: Server is full
 restart: [Proxy] Proxy restarting.
 server_kick: [Kicked] 
-server_list: \u00A76You may connect to the following servers at this time: 
+server_list: \u00a76You may connect to the following servers at this time: 
 total_players: Total players online: