diff --git a/include/login.h b/include/login.h
index 7e10aec..7605696 100644
--- a/include/login.h
+++ b/include/login.h
@@ -58,6 +58,24 @@ public:
      */
     virtual ~Login() {}
     
+    /**
+     *  Retrieve the user name
+     *  @return string
+     */
+    const std::string &user() const
+    {
+        return _user;
+    }
+    
+    /**
+     *  Retrieve the password
+     *  @return string
+     */
+    const std::string &password() const
+    {
+        return _password;
+    }
+    
     /**
      *  String representation in SASL PLAIN mode
      *  @return string
diff --git a/src/Makefile b/src/Makefile
index 3a9b4e9..3ba1fd9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-CPP			    = g++
+CPP			    = g++-4.8
 RM			    = rm -f
 CPPFLAGS		= -Wall -c -I. -O2 -flto -std=c++11 -g
 LD			    = g++