diff --git a/dll/win32/ifmon/ip.c b/dll/win32/ifmon/ip.c
index 9c9538fa0f5..d5fed2638f6 100644
--- a/dll/win32/ifmon/ip.c
+++ b/dll/win32/ifmon/ip.c
@@ -70,8 +70,12 @@ IpSetAddress(
                           {L"mask", NS_REQ_ZERO, FALSE},
                           {L"gateway", NS_REQ_ZERO, FALSE},
                           {L"gwmetric", NS_REQ_ZERO, FALSE}};
+    TOKEN_VALUE ptvSource[] = {{L"static", 1},
+                               {L"dhcp", 2}};
+    GUID InterfaceGUID;
     PDWORD pdwTagType = NULL;
-    DWORD i;
+    DWORD i, dwSource = 0;
+    BOOL bHaveName = FALSE, bHaveSource = FALSE;
     DWORD dwError = ERROR_SUCCESS;
 
     DPRINT1("IpSetAddress()\n");
@@ -106,10 +110,45 @@ IpSetAddress(
         {
             case 0: /* name */
                 DPRINT1("Tag: name (%S)\n", argv[i + dwCurrentIndex]);
+
+                dwError = NhGetGuidFromInterfaceName(argv[i + dwCurrentIndex],
+                                                     &InterfaceGUID,
+                                                     0, 0);
+                if (dwError != ERROR_SUCCESS)
+                {
+                    DPRINT1("NhGetGuidFromInterfaceName() failed (Error %lu)\n", dwError);
+                    PrintMessageFromModule(hDllInstance,
+                                           IDS_ERROR_INVALID_INTERFACE,
+                                           argv[i + dwCurrentIndex]);
+                    dwError = ERROR_SUPPRESS_OUTPUT;
+                    break;
+                }
+                DPRINT1("Interface: {%08lx-%04hx-%04hx-%02x%02x-%02x%02x%02x%02x%02x%02x}\n",
+                        InterfaceGUID.Data1, InterfaceGUID.Data2, InterfaceGUID.Data3, InterfaceGUID.Data4[0], InterfaceGUID.Data4[1],
+                        InterfaceGUID.Data4[2], InterfaceGUID.Data4[3], InterfaceGUID.Data4[4], InterfaceGUID.Data4[5], InterfaceGUID.Data4[6], InterfaceGUID.Data4[7]);
+                bHaveName = TRUE;
                 break;
 
             case 1: /* source */
                 DPRINT1("Tag: source (%S)\n", argv[i + dwCurrentIndex]);
+
+                dwError = MatchEnumTag(hDllInstance,
+                                       argv[i + dwCurrentIndex],
+                                       ARRAYSIZE(ptvSource),
+                                       ptvSource,
+                                       &dwSource);
+                if (dwError != ERROR_SUCCESS)
+                {
+                    DPRINT1("MatchEnumTag() failed (Error %lu)\n", dwError);
+                    PrintMessageFromModule(hDllInstance,
+                                           IDS_ERROR_BAD_VALUE,
+                                           argv[i + dwCurrentIndex],
+                                           pttTags[pdwTagType[i]].pwszTag);
+                    dwError = ERROR_SUPPRESS_OUTPUT;
+                    break;
+                }
+                DPRINT1("Source: %lu\n", dwSource);
+                bHaveSource = TRUE;
                 break;
 
             case 2: /* addr */
@@ -137,6 +176,23 @@ IpSetAddress(
     if (pdwTagType)
         HeapFree(GetProcessHeap(), 0, pdwTagType);
 
+
+    /* Check parameters */
+
+    /* The interface name is mandatory */
+    if (bHaveName == FALSE)
+    {
+        DPRINT1("The Name argument is mssing!\n");
+//        return ERROR_INVALID_SYNTAX;
+    }
+
+    if (bHaveSource == FALSE)
+    {
+        DPRINT1("The Source argument is mssing!\n");
+//        return ERROR_INVALID_SYNTAX;
+    }
+
+    DPRINT1("IpSetAddress() done (Error %lu)\n", dwError);
     return dwError;
 }
 
diff --git a/dll/win32/ifmon/lang/en-US.rc b/dll/win32/ifmon/lang/en-US.rc
index 30845e5ff1a..9546ee9eee8 100644
--- a/dll/win32/ifmon/lang/en-US.rc
+++ b/dll/win32/ifmon/lang/en-US.rc
@@ -94,4 +94,6 @@ Parameters:\n\n\
     IDS_DUMP_IP_INTERFACE "# Interface IP Configuration for ""%s""\n"
     IDS_DUMP_IP_FOOTER    "# End of Interface IP Configuration\n"
 
+    IDS_ERROR_INVALID_INTERFACE  "\nInvalid interface %s specified.\n"
+    IDS_ERROR_BAD_VALUE "\n%s is not an acceptable value for %s.\n"
 END
diff --git a/dll/win32/ifmon/resource.h b/dll/win32/ifmon/resource.h
index a5ba29a7b75..989f39bccaf 100644
--- a/dll/win32/ifmon/resource.h
+++ b/dll/win32/ifmon/resource.h
@@ -45,4 +45,5 @@
 #define IDS_DUMP_IP_INTERFACE  803
 #define IDS_DUMP_IP_FOOTER     804
 
-
+#define IDS_ERROR_INVALID_INTERFACE         2000
+#define IDS_ERROR_BAD_VALUE                 2001