diff --git a/scm-core/src/main/java/sonia/scm/url/WUIUrlProvider.java b/scm-core/src/main/java/sonia/scm/url/WUIUrlProvider.java
index f022e3ca0d..0c92fcb406 100644
--- a/scm-core/src/main/java/sonia/scm/url/WUIUrlProvider.java
+++ b/scm-core/src/main/java/sonia/scm/url/WUIUrlProvider.java
@@ -75,17 +75,17 @@ public class WUIUrlProvider implements UrlProvider
   //~--- get methods ----------------------------------------------------------
 
   /**
-   * Method description
+   * Returns the baseUrl, because there is no authentication url.
    *
    *
+   * @returns the baseUrl, because there is no authentication url
+   *
    * @return
    */
   @Override
   public String getAuthenticationUrl()
   {
-
-    // ???
-    return null;
+    return baseUrl;
   }
 
   /**
@@ -125,17 +125,15 @@ public class WUIUrlProvider implements UrlProvider
   }
 
   /**
-   * Method description
+   * Returns the baseUrl, because there is no state url.
    *
    *
-   * @return
+   * @return the baseUrl, because there is no state url
    */
   @Override
   public String getStateUrl()
   {
-
-    // ???
-    return null;
+    return baseUrl;
   }
 
   /**
diff --git a/scm-core/src/test/java/sonia/scm/url/WUIUrlProviderTest.java b/scm-core/src/test/java/sonia/scm/url/WUIUrlProviderTest.java
new file mode 100644
index 0000000000..ca41f4701c
--- /dev/null
+++ b/scm-core/src/test/java/sonia/scm/url/WUIUrlProviderTest.java
@@ -0,0 +1,138 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.url;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.util.HttpUtil;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class WUIUrlProviderTest extends UrlProviderTestBase
+{
+
+  /** Field description */
+  public static final String URLSUFFIX_INDEX = "/index.html";
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param baseUrl
+   *
+   * @return
+   */
+  @Override
+  protected UrlProvider createUrlProvider(String baseUrl)
+  {
+    return UrlProviderFactory.createUrlProvider(baseUrl,
+            UrlProviderFactory.TYPE_WUI);
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param baseUrl
+   *
+   * @return
+   */
+  @Override
+  protected String getExpectedAuthenticationUrl(String baseUrl)
+  {
+    return createWuiUrl(baseUrl);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param baseUrl
+   *
+   * @return
+   */
+  @Override
+  protected String getExpectedConfigUrl(String baseUrl)
+  {
+    return createWuiUrl(baseUrl, "scmConfig");
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param baseUrl
+   *
+   * @return
+   */
+  @Override
+  protected String getExpectedStateUrl(String baseUrl)
+  {
+    return createWuiUrl(baseUrl);
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param baseUrl
+   *
+   * @return
+   */
+  private String createWuiUrl(String baseUrl)
+  {
+    return baseUrl.concat(URLSUFFIX_INDEX);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param baseUrl
+   * @param param
+   *
+   * @return
+   */
+  private String createWuiUrl(String baseUrl, String param)
+  {
+    return baseUrl.concat(URLSUFFIX_INDEX).concat(
+        HttpUtil.SEPARATOR_HASH).concat(param);
+  }
+}