diff --git a/tracks/app/models/user.rb b/tracks/app/models/user.rb
index 8db596e0..a3d2a6d9 100644
--- a/tracks/app/models/user.rb
+++ b/tracks/app/models/user.rb
@@ -26,16 +26,16 @@ protected
     Digest::SHA1.hexdigest("#{SALT}--#{pass}--")
   end
 
-  before_create :crypt_password
+  before_create :crypt_password_and_word
 
-  def crypt_password
+  def crypt_password_and_word
     write_attribute("password", self.class.sha1(password)) if password == @password_confirmation
-    write_attribute("word", self.class.sha1(login + word))
+    write_attribute("word", self.class.sha1(login + Time.now.to_i.to_s + rand.to_s))
   end
-
+  
   validates_length_of :password, :within => 5..40
   validates_length_of :login, :within => 3..80
-  validates_presence_of :password, :login, :word
+  validates_presence_of :password, :login
   validates_uniqueness_of :login, :on => :create
   validates_confirmation_of :password, :on => :create
   
diff --git a/tracks/app/views/login/signup.rhtml b/tracks/app/views/login/signup.rhtml
index f91c1dfc..bfabc017 100644
--- a/tracks/app/views/login/signup.rhtml
+++ b/tracks/app/views/login/signup.rhtml
@@ -21,11 +21,7 @@
       <td><%= password_field "user", "password_confirmation", :size => 20 %></td>
     </tr>
     <tr>
-      <td><label for="user_word">Secret word*:</label></td>
-      <td><%= password_field "user", "word", :size => 20 %></td>
-    </tr>
-    <tr>
-      <td>* different to password</td>
+      <td></td>
       <td><input type="submit" value="Signup &#187;" class="primary" /></td>
     </tr>
   </table>