Fixed a problem preventing login

Gemfile.lock

@@ -12,11 +12,6 @@ GIT
     i18n-active_record (0.0.2)
       i18n (>= 0.5.0)
 
-PATH
-  remote: ../carmen/
-  specs:
-    carmen (1.0.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -71,6 +66,8 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    carmen (1.0.1)
+      unicode_utils (~> 1.4.0)
     carmen-rails (1.0.1)
       carmen (~> 1.0.0)
       rails
@@ -338,6 +335,7 @@ GEM
     uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    unicode_utils (1.4.0)
     uniform_notifier (1.4.0)
     wdm (0.1.0)
     webmock (1.17.4)
@@ -359,7 +357,6 @@ DEPENDENCIES
   binding_of_caller
   bullet
   capybara
-  carmen!
   carmen-rails
   carrierwave
   carrierwave-imageoptimizer

app/helpers/bike_bike_form_helper.rb

@@ -194,17 +194,14 @@ module BikeBikeFormHelper
 		render_field(method, options = get_options(method, options), super(object_name, method, options), get_value(method, options))
 	end
 
-	#def fields_for
 	def form_for(*args, &block)
 		@record = args.first
 
 		template = 'errors_' + @record.class.name.underscore
 		template = 'errors_default' unless lookup_context.exists?(template, [TEMPLATE_DIR], true)
 
-		( render (TEMPLATE_DIR + '/' + template) ) + super(args, &block)
+		( render (TEMPLATE_DIR + '/' + template) ) + super(*args, &block)
 	end
-	#def label
-
 
 	def collection_check_boxes(object, method, collection, value_method, text_method, options = {}, html_options = {}, &block)
 		render_field(method, options = get_options(method, options), super(object, method, collection, value_method, text_method, options, html_options, &block), get_value(method, options))

app/views/users/_form.html.haml

@@ -1,10 +1,10 @@
-= form_for @user, :html => (@user.id ? {:multipart => true} : {}) do |f|
+= form_for @user, :html => (@user && @user.id ? {:multipart => true} : {}) do |f|
 	%div{:class => (@user.id ? 'columns medium-6' : '')}
 		= f.text_field :username
 		= f.email_field :email
 		- if !@user.id
-			= f.password_field, :password
-			= f.password_field, :password_confirmation
+			= f.password_field :password
+			= f.password_field :password_confirmation
 			= f.actions :register
 	- if @user.id
 		.columns.medium-6

db/schema.rb

@@ -182,8 +182,8 @@ ActiveRecord::Schema.define(version: 20140315183241) do
   end
 
   create_table "user_organization_relationships", force: true do |t|
-    t.integer  "user_id",         null: false
-    t.integer  "organization_id", null: false
+    t.integer  "user_id"
+    t.integer  "organization_id"
     t.string   "relationship"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -221,7 +221,7 @@ ActiveRecord::Schema.define(version: 20140315183241) do
     t.string   "whodunnit"
     t.text     "object"
     t.datetime "created_at"
-    t.text     "value"
+    t.string   "value"
   end
 
   create_table "workshop_facilitators", force: true do |t|