Index: trunk/eCard/Expo/login.aspx
===================================================================
--- trunk/eCard/Expo/login.aspx (revision 477)
+++ trunk/eCard/Expo/login.aspx (revision 513)
@@ -13,8 +13,8 @@
         <p><asp:Label ID="NIPLabel" runat="server" AssociatedControlID ="NIPTextBox" Text="NIP:"
             meta:resourcekey="login_NIPLabel" Width="200px"></asp:Label>
-        <asp:TextBox ID="NIPTextBox" runat="server"></asp:TextBox></p>                        
+        <asp:TextBox ID="NIPTextBox" runat="server"></asp:TextBox><asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ErrorMessage="*" ControlToValidate="NIPTextBox" /></p>                        
         <p><asp:Label ID="NrZlecLabel" runat="server" AssociatedControlID ="NrZlecTextBox" Text="Nr faktury:"
             meta:resourcekey="login_NrZlecLabel" Width="200px"></asp:Label>
-        <asp:TextBox ID="NrZlecTextBox" runat="server"></asp:TextBox></p>
+        <asp:TextBox ID="NrZlecTextBox" runat="server"></asp:TextBox><asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ErrorMessage="*" ControlToValidate="NrZlecTextBox" /></p>
         <p>
             <asp:Button ID="ZalogujButton" runat="server" Text="Zaloguj" meta:resourcekey="ZalogujButton" OnClick="ZalogujButton_Click"/></p>
Index: trunk/eCard/Expo/App_LocalResources/login.aspx.de.resx
===================================================================
--- trunk/eCard/Expo/App_LocalResources/login.aspx.de.resx (revision 477)
+++ trunk/eCard/Expo/App_LocalResources/login.aspx.de.resx (revision 513)
@@ -119,5 +119,5 @@
   </resheader>
   <data name="errorMsg" xml:space="preserve">
-    <value>Falsche VAT-Zahl oder Auftragsnummer
+    <value>Falsche VAT-Zahl oder Rechnungsnummer
 </value>
   </data>
Index: trunk/eCard/Expo/App_LocalResources/login.aspx.resx
===================================================================
--- trunk/eCard/Expo/App_LocalResources/login.aspx.resx (revision 477)
+++ trunk/eCard/Expo/App_LocalResources/login.aspx.resx (revision 513)
@@ -119,5 +119,5 @@
   </resheader>
   <data name="errorMsg" xml:space="preserve">
-    <value>Incorrect VAT number or order number
+    <value>Incorrect VAT number or invoice number
 </value>
   </data>
Index: trunk/eCard/Expo/App_LocalResources/login.aspx.pl.resx
===================================================================
--- trunk/eCard/Expo/App_LocalResources/login.aspx.pl.resx (revision 477)
+++ trunk/eCard/Expo/App_LocalResources/login.aspx.pl.resx (revision 513)
@@ -119,5 +119,5 @@
   </resheader>
   <data name="errorMsg" xml:space="preserve">
-    <value>Niepoprawny NIP lub numer zlecenia.</value>
+    <value>Niepoprawny NIP lub numer faktury.</value>
   </data>
   <data name="informacja1Literal.Text" xml:space="preserve">
Index: trunk/eCard/Expo/login.aspx.cs
===================================================================
--- trunk/eCard/Expo/login.aspx.cs (revision 486)
+++ trunk/eCard/Expo/login.aspx.cs (revision 513)
@@ -35,6 +35,8 @@
     protected void ZalogujButton_Click(object sender, EventArgs e)
     {
+        if (!Page.IsValid) return;
         string nip = NIPTextBox.Text.Replace(" ", string.Empty).Replace("-", string.Empty);
         string nrZlec = NrZlecTextBox.Text.Replace(" ", string.Empty);
+
         bool czyZalogowany = Zaloguj(nip, nrZlec);
         if (czyZalogowany)
@@ -50,4 +52,6 @@
     bool Zaloguj(string nip, string nrFaktury)
     {
+        if (nrFaktury.Split('/').Length != 3) return false;
+
         string fakturaNr = nrFaktury.Split('/')[0];
         string fakturaRoz = nrFaktury.Split('/')[1];