diff --git a/akka-core/src/main/scala/remote/RemoteServer.scala b/akka-core/src/main/scala/remote/RemoteServer.scala
index 5d25d81b75..db4490761b 100644
--- a/akka-core/src/main/scala/remote/RemoteServer.scala
+++ b/akka-core/src/main/scala/remote/RemoteServer.scala
@@ -76,8 +76,7 @@ object RemoteServer {
   }
 
   val SECURE = {
-    //TODO: Remove this when SSL is in working condition
-    /*if(config.getBool("akka.remote.ssl.service",false)){
+    if(config.getBool("akka.remote.ssl.service",false)){
 
       val properties = List(
         ("key-store-type"  ,"keyStoreType"),
@@ -98,7 +97,7 @@ object RemoteServer {
 
       true
     }
-    else */
+    else
       false
   }
 
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 33806c1d3d..3b80953fe6 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -76,7 +76,7 @@ akka {
     zlib-compression-level = 6  # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6
 
     ssl {
-      service = off #on / off (THIS FEATURE IS NOT ACTIVATED YET, STAY TUNED)
+      service = off #on / off
 
       #You can either use java command-line options or use the settings below