diff --git a/core/src/cz/nic/tablexia/TablexiaSettings.java b/core/src/cz/nic/tablexia/TablexiaSettings.java
index 7b06fe524e4c7d10cd6a75f61260a12c52b10862..c7d61812a581e7f447e63a48c148ad41b7710796 100644
--- a/core/src/cz/nic/tablexia/TablexiaSettings.java
+++ b/core/src/cz/nic/tablexia/TablexiaSettings.java
@@ -13,7 +13,7 @@ import cz.nic.tablexia.game.GameDefinition;
 import cz.nic.tablexia.game.difficulty.GameDifficulty;
 import cz.nic.tablexia.loader.application.ApplicationTextManager;
 import cz.nic.tablexia.screen.AbstractTablexiaScreen;
-import cz.nic.tablexia.screen.createuser.form.swipehandler.SwipeDebugScreen;
+import cz.nic.tablexia.screen.createuser.FormScreen;
 import cz.nic.tablexia.util.Log;
 import cz.nic.tablexia.util.Utility;
 
@@ -24,7 +24,7 @@ public class TablexiaSettings {
     private static final int     MIN_SCREEN_HEIGHT         = (int) (DEFAULT_SCREEN_WIDTH * MAXIMUM_RATIO);
     private static final boolean DEBUG_SHOW_BOUNDING_BOXES = true;
 
-    public static final Class<? extends AbstractTablexiaScreen<?>> INITIAL_SCREEN = SwipeDebugScreen.class;
+    public static final Class<? extends AbstractTablexiaScreen<?>> INITIAL_SCREEN = FormScreen.class;
     public static final int                                        AVATAR_COUNT   = 8;
 
     private static final String PREFERENCES_KEY    = "cz.nic.tablexia.";
diff --git a/core/src/cz/nic/tablexia/screen/createuser/FormScreen.java b/core/src/cz/nic/tablexia/screen/createuser/FormScreen.java
index ddf7704650ff8393c0546db8262d1de260990264..e188d2e4ef52b6420fe061c859fb2142c4b3bb85 100644
--- a/core/src/cz/nic/tablexia/screen/createuser/FormScreen.java
+++ b/core/src/cz/nic/tablexia/screen/createuser/FormScreen.java
@@ -24,11 +24,11 @@ import cz.nic.tablexia.loader.application.ApplicationFontManager;
 import cz.nic.tablexia.model.User;
 import cz.nic.tablexia.screen.AbstractAutoloadTablexiaScreen;
 import cz.nic.tablexia.screen.createuser.form.FormInputListener;
+import cz.nic.tablexia.screen.createuser.form.SignatureDialog;
 import cz.nic.tablexia.util.Log;
 import cz.nic.tablexia.util.ScaleUtil;
 import cz.nic.tablexia.util.listener.DragActorListener;
 import cz.nic.tablexia.util.listener.DragSwitchListener;
-import cz.nic.tablexia.util.ui.dialog.TablexiaDialog;
 
 public class FormScreen extends AbstractAutoloadTablexiaScreen<Void> {
     public static final  String BASET_ASSET_PATH = "screen/createuser/form";
@@ -283,7 +283,7 @@ public class FormScreen extends AbstractAutoloadTablexiaScreen<Void> {
 
 
         getStage().addActor(signature);
-        Dialog dialog = new TablexiaDialog(getStage().getWidth() * 0.1f, getStage().getWidth() * 0.1f - (getStage().getCamera().position.y - getStage().getHeight() / 2) / 2, getStage().getWidth() * 0.8f, getStage().getHeight() * 0.8f, TablexiaDialog.BackGroundType.DIALOG_RECTANGLE).show(getStage());
+        Dialog dialog = new SignatureDialog(getStage().getWidth() * 0.1f, getStage().getWidth() * 0.1f - (getStage().getCamera().position.y - getStage().getHeight() / 2) / 2, getStage().getWidth() * 0.8f, getStage().getHeight() * 0.8f).show(getStage());
     }
 
 }
diff --git a/core/src/cz/nic/tablexia/screen/createuser/form/SignatureDialog.java b/core/src/cz/nic/tablexia/screen/createuser/form/SignatureDialog.java
new file mode 100644
index 0000000000000000000000000000000000000000..97cbd9372e7260e2988952fcab7a12527118742a
--- /dev/null
+++ b/core/src/cz/nic/tablexia/screen/createuser/form/SignatureDialog.java
@@ -0,0 +1,21 @@
+package cz.nic.tablexia.screen.createuser.form;
+
+import cz.nic.tablexia.util.ui.dialog.TablexiaDialog;
+
+/**
+ * Created by lhoracek on 4/24/15.
+ */
+public class SignatureDialog extends TablexiaDialog {
+    public SignatureDialog(float x, float y, float width, float height) {
+        super(x, y, width, height, BackGroundType.DIALOG_RECTANGLE);
+    }
+
+    @Override
+    public void prepareContent() {
+        super.prepareContent();
+        SignaturePane pane = new SignaturePane();
+        pane.setSize(getWidth(), getHeight());
+        pane.setPosition(0,0);
+        addActor(pane);
+    }
+}
diff --git a/core/src/cz/nic/tablexia/screen/createuser/form/SignaturePane.java b/core/src/cz/nic/tablexia/screen/createuser/form/SignaturePane.java
index 19acbba7005fa11d8e4d8add40d24e25dbe682f5..b5eb988f91d20bacf9f02b89b97b12e13895e62a 100644
--- a/core/src/cz/nic/tablexia/screen/createuser/form/SignaturePane.java
+++ b/core/src/cz/nic/tablexia/screen/createuser/form/SignaturePane.java
@@ -1,5 +1,6 @@
 package cz.nic.tablexia.screen.createuser.form;
 
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.math.Vector2;
@@ -26,10 +27,12 @@ public class SignaturePane extends Actor {
             float[] vert = new float[swipeHandler.path().size * 2];
             for (int i = 0; i < swipeHandler.path().size; i++) {
                 Vector2 proj = getStage().getViewport().project(swipeHandler.path().get(i).cpy());
-                vert[i * 2] = proj.x;
-                vert[i * 2 + 1] = proj.y;
+                Vector2 sc = localToStageCoordinates(proj);
+                vert[i * 2] = sc.x;
+                vert[i * 2 + 1] = sc.y;
             }
             shapeRenderer.begin(ShapeRenderer.ShapeType.Line);
+            shapeRenderer.setColor(Color.BLUE);
             shapeRenderer.polyline(vert);
             shapeRenderer.end();
         }