diff --git a/plugins/network/app/controllers/network_controller.rb b/plugins/network/app/controllers/network_controller.rb
index 373b2614..2b82c62c 100644
--- a/plugins/network/app/controllers/network_controller.rb
+++ b/plugins/network/app/controllers/network_controller.rb
@@ -19,17 +19,6 @@
 # you may find current contact information at www.novell.com
 #++
 
-require 'socket'
-def getCurrentIP
-  ip, orig, Socket.do_not_reverse_lookup = "", Socket.do_not_reverse_lookup, true  # turn off reverse DNS resolution temporarily
-  UDPSocket.open do |s|
-    s.connect '64.233.187.99', 1
-    ip = s.addr.last
-  end
-  ensure Socket.do_not_reverse_lookup = orig
-  return ip
-end
-
 class NetworkController < ApplicationController
 
   before_filter :login_required
@@ -95,13 +84,7 @@ def index
     @bootproto = ifc.bootproto
     @bootproto = STATIC_BOOT_ID if @bootproto.blank?
 
-    if @bootproto == STATIC_BOOT_ID
-      ipaddr = ifc.ipaddr
-    else
-      ipaddr = "/"
-    end
-    
-    @ip, @netmask = ipaddr.split "/"
+    @ip, @netmask = @bootproto == STATIC_BOOT_ID ? ifc.ipaddr.split("/"): ["", ""]
     # when detect PREFIXLEN with leading "/"
     if ifc.bootproto == STATIC_BOOT_ID && NETMASK_RANGE.include?(@netmask.to_i)
       @netmask = "/"+@netmask
@@ -113,8 +96,9 @@ def index
     @name = hn.name
     @domain = hn.domain
     
-    @dhcp_ip = getCurrentIP;
-    
+    if @bootproto == "dhcp"
+      @actual_ip, @actual_netmask = ifc.actual_ipaddr.split("/")
+    end
     @dhcp_hostname_enabled = hn.attributes.include?("dhcp_hostname")
     @dhcp_hostname = @dhcp_hostname_enabled && hn.dhcp_hostname=="1" 
     @nameservers = dns.nameservers
diff --git a/plugins/network/app/views/network/index.html.erb b/plugins/network/app/views/network/index.html.erb
index 0e3e93bc..067e9b84 100644
--- a/plugins/network/app/views/network/index.html.erb
+++ b/plugins/network/app/views/network/index.html.erb
@@ -176,12 +176,14 @@
           <%=text_field_tag :searchdomains, @searchdomains.join(" "), :class=>"searchdomains", :disabled => write_disabled %>
         </div>
 
-        <div id="ip_sticker" class="right">
-          <span>
-            <span style="display:block; background:#eee; padding:2px 3px; font-size:11px;"><%=_("Current IP address (DHCP)")%></span>
-            <span style="font-size:20px; padding:5px 0px;"><%= @dhcp_ip %></span>
-          </span>
-        </div>
+	<% if @actual_ip %>
+          <div id="ip_sticker" class="right">
+            <span>
+              <span style="display:block; background:#eee; padding:2px 3px; font-size:11px;"><%=_("Current IP address (DHCP)")%></span>
+              <span style="font-size:20px; padding:5px 0px;"><%= @actual_ip %></span>
+            </span>
+          </div>
+	<% end %>
 
         <div class="row manual">
           <label><%=_("Change hostname by DHCP")%></label>