diff --git a/pkg/challenge/init b/pkg/challenge/init
index faf9664..2f1a2d5 100755
--- a/pkg/challenge/init
+++ b/pkg/challenge/init
@@ -19,6 +19,9 @@ cmdline() {
 # Get some command line options
 USER_LOGIN=$(cmdline adlin.login)
 USER_PKEY=$(cmdline adlin.key)
+USER_IP=$(cmdline adlin.ip)
+
+[ -n "${USER_IP}" ] && echo "${USER_IP}" > /root/my_ip
 
 # Define hostname
 hostname adlin-${USER_LOGIN}
diff --git a/pkg/login-validator/cmd/arp.go b/pkg/login-validator/cmd/arp.go
index c30eed0..99bf4f7 100644
--- a/pkg/login-validator/cmd/arp.go
+++ b/pkg/login-validator/cmd/arp.go
@@ -52,7 +52,7 @@ func ARPAnalyze() (ents []ARPEntry, err error) {
 
 func ARPContainsIP(ents []ARPEntry, ip net.IP) *ARPEntry {
 	for i, e := range ents {
-		if e.IP.Equal(ip) && e.Flags == 2 {
+		if e.IP.Equal(ip) && (e.Flags == 2 || e.Flags == 6) {
 			return &ents[i]
 		}
 	}
diff --git a/pkg/login-validator/cmd/login.go b/pkg/login-validator/cmd/login.go
index ee721c1..a949166 100644
--- a/pkg/login-validator/cmd/login.go
+++ b/pkg/login-validator/cmd/login.go
@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -171,6 +170,7 @@ func (l loginChecker) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if mac == nil {
 		log.Printf("Unable to find MAC address for given IP (%s)\n", ip)
 		http.Error(w, "Internal server error. Please retry in a few minutes", http.StatusInternalServerError)
+		return
 	}
 
 	// Register the user remotely
@@ -178,7 +178,7 @@ func (l loginChecker) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		log.Println("Error on remote registration:", err)
 		http.Error(w, "Internal server error. Please retry in a few minutes", http.StatusInternalServerError)
 		return
-	} else if err := l.lateLoginAction(lu.Username, r.RemoteAddr, *mac); err != nil {
+	} else if err := l.lateLoginAction(lu.Username, r.RemoteAddr, *mac, ip); err != nil {
 		log.Println("Error on late login action:", err)
 		http.Error(w, "Internal server error. Please retry in a few minutes", http.StatusInternalServerError)
 		return
@@ -188,7 +188,13 @@ func (l loginChecker) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func (l loginChecker) registerUser(username, remoteAddr string, ent ARPEntry) ([]byte, error) {
+type myIP struct {
+	Id    int64     `json:"id"`
+	Login string    `json:"login"`
+	IP    string    `json:"ip"`
+}
+
+func (l loginChecker) registerUser(username, remoteAddr string, ent ARPEntry) (net.IP, error) {
 	bts, err := json.Marshal(map[string]interface{}{"login": username, "ip": remoteAddr, "mac": fmt.Sprintf("%02x:%02x:%02x:%02x:%02x:%02x", ent.HWAddress[0], ent.HWAddress[1], ent.HWAddress[2], ent.HWAddress[3], ent.HWAddress[4], ent.HWAddress[5])})
 	if err != nil {
 		return nil, nil
@@ -211,10 +217,15 @@ func (l loginChecker) registerUser(username, remoteAddr string, ent ARPEntry) ([
 	if resp.StatusCode != http.StatusOK {
 		return nil, errors.New(resp.Status)
 	} else {
-		return ioutil.ReadAll(resp.Body)
+		dec := json.NewDecoder(resp.Body)
+		var myip myIP
+		if err := dec.Decode(&myip); err != nil {
+			return nil, err
+		}
+		return net.ParseIP(myip.IP), nil
 	}
 }
 
-func (l loginChecker) lateLoginAction(username, remoteAddr string, mac ARPEntry) error {
-	return RegisterUserMAC(mac, username)
+func (l loginChecker) lateLoginAction(username, remoteAddr string, mac ARPEntry, ip net.IP) error {
+	return RegisterUserMAC(mac, ip, username)
 }
diff --git a/pkg/login-validator/cmd/pxetpl.go b/pkg/login-validator/cmd/pxetpl.go
index 038beb4..2ee2d64 100644
--- a/pkg/login-validator/cmd/pxetpl.go
+++ b/pkg/login-validator/cmd/pxetpl.go
@@ -15,19 +15,19 @@ const pxeUserTplPath = "pxelinux.cfg/tpl"
 const ipxeUserTplPath = "pxelinux.cfg/tpl.ipxe"
 const pxeUserPath = "pxelinux.cfg"
 
-func RegisterUserMAC(ent ARPEntry, username string) error {
-	if err := registerUser(ipxeUserTplPath, fmt.Sprintf("%02x:%02x:%02x:%02x:%02x:%02x.ipxe", ent.HWAddress[0], ent.HWAddress[1], ent.HWAddress[2], ent.HWAddress[3], ent.HWAddress[4], ent.HWAddress[5]), username); err != nil {
+func RegisterUserMAC(ent ARPEntry, ip net.IP, username string) error {
+	if err := registerUser(ipxeUserTplPath, fmt.Sprintf("%02x:%02x:%02x:%02x:%02x:%02x.ipxe", ent.HWAddress[0], ent.HWAddress[1], ent.HWAddress[2], ent.HWAddress[3], ent.HWAddress[4], ent.HWAddress[5]), username, ip); err != nil {
 		return err
 	} else {
-		return registerUser(pxeUserTplPath, fmt.Sprintf("%02x-%02x-%02x-%02x-%02x-%02x-%02x", ent.HWType, ent.HWAddress[0], ent.HWAddress[1], ent.HWAddress[2], ent.HWAddress[3], ent.HWAddress[4], ent.HWAddress[5]), username)
+		return registerUser(pxeUserTplPath, fmt.Sprintf("%02x-%02x-%02x-%02x-%02x-%02x-%02x", ent.HWType, ent.HWAddress[0], ent.HWAddress[1], ent.HWAddress[2], ent.HWAddress[3], ent.HWAddress[4], ent.HWAddress[5]), username, ip)
 	}
 }
 
 func RegisterUserIP(ip net.IP, username string) error {
-	return registerUser(pxeUserTplPath, fmt.Sprintf("%02X%02X%02X%02X", ip.To4()[0], ip.To4()[1], ip.To4()[2], ip.To4()[3]), username)
+	return registerUser(pxeUserTplPath, fmt.Sprintf("%02X%02X%02X%02X", ip.To4()[0], ip.To4()[1], ip.To4()[2], ip.To4()[3]), username, ip)
 }
 
-func registerUser(tplPath string, filename string, username string) error {
+func registerUser(tplPath string, filename string, username string, ip net.IP) error {
 	if pxeTplCnt, err := ioutil.ReadFile(path.Join(tftpDir, tplPath)); err != nil {
 		return err
 	} else if userfd, err := os.OpenFile(path.Join(tftpDir, pxeUserPath, filename), os.O_RDWR|os.O_CREATE, 0644); err != nil {
@@ -39,7 +39,11 @@ func registerUser(tplPath string, filename string, username string) error {
 
 		if pxeTmpl, err := template.New("pxeUser").Parse(string(pxeTplCnt)); err != nil {
 			return err
-		} else if err := pxeTmpl.Execute(userfd, map[string]string{"username": username, "pkey": fmt.Sprintf("%x", pkey.Sum([]byte(username)))}); err != nil {
+		} else if err := pxeTmpl.Execute(userfd, map[string]string{
+			"username": username,
+			"pkey": fmt.Sprintf("%x", pkey.Sum([]byte(username))),
+			"ip": fmt.Sprintf("%d.%d.%d.%d", ip.To4()[0], ip.To4()[1], ip.To4()[2], ip.To4()[3]),
+		}); err != nil {
 			return err
 		}
 	}