diff --git a/lib/WebGUI/Form/Float.pm b/lib/WebGUI/Form/Float.pm
index 3fc9a87e4..882fa48ad 100644
--- a/lib/WebGUI/Form/Float.pm
+++ b/lib/WebGUI/Form/Float.pm
@@ -100,7 +100,7 @@ Returns the integer from the form post, or returns 0.0 if the post result is inv
 sub getValueFromPost {
 	my $self = shift;
 	my $value = $self->session->form->param($self->get("name"));
-	if ($value =~ /^-?[\d\.]+$/) {
+	if ($value =~ /^-?[\d\.]+$/ and $value =~ /\d/) {
                 return $value;
         }
         return 0.0;
diff --git a/lib/WebGUI/Form/Phone.pm b/lib/WebGUI/Form/Phone.pm
index 99a6532c3..76e959873 100644
--- a/lib/WebGUI/Form/Phone.pm
+++ b/lib/WebGUI/Form/Phone.pm
@@ -79,7 +79,7 @@ Returns a string filtered to allow only digits, spaces, and these special charac
 sub getValueFromPost {
 	my $self = shift;
 	my $value = $self->session->form->param($self->get("name"));
-   	if ($value =~ /^[\d\s\-\+\(\)]+$/) {
+   	if ($value =~ /^[\d \.\-\+\(\)]+$/ and $value =~ /\d/) {
                 return $value;
         }
         return undef;
diff --git a/t/Form/Float.t b/t/Form/Float.t
index 36efcea20..1c864ac81 100644
--- a/t/Form/Float.t
+++ b/t/Form/Float.t
@@ -40,7 +40,7 @@ tie %testBlock, 'Tie::IxHash';
 	FLOAT4 => [ '-.123456',   'EQUAL', 'valid, negative, no integer part'],
 	FLOAT5 => [ '+123.456',    0, 'invalid, no explicit plus sign'],
 	FLOAT6 => [ '123456',      'EQUAL', 'WRONG, no decimal point'],
-	FLOAT7 => [ '......',      'EQUAL', 'WRONG, no digits'],
+	FLOAT7 => [ '......',      0, 'invalid, no digits'],
 	FLOAT7 => [ '-00789.25',   'EQUAL', 'leading zeroes are okay'],
 	FLOAT8 => [ '.123-456',    0, 'invalid, embedded minus sign'],
 );
diff --git a/t/Form/Phone.t b/t/Form/Phone.t
new file mode 100644
index 000000000..c540f1f2c
--- /dev/null
+++ b/t/Form/Phone.t
@@ -0,0 +1,107 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2006 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+
+use WebGUI::Test;
+use WebGUI::Form;
+use WebGUI::Form::Phone;
+use WebGUI::Session;
+use HTML::Form;
+use Tie::IxHash;
+use WebGUI::Form_Checking;
+
+#The goal of this test is to verify that Phone form elements work
+
+use Test::More; # increment this value for each test you create
+
+my $session = WebGUI::Test->session;
+
+# put your tests here
+
+my %testBlock;
+
+tie %testBlock, 'Tie::IxHash';
+
+%testBlock = (
+	PHONE1 => [ "503\n867\n5309",  undef, 'newline separation'],
+	PHONE2 => [ '503 867 5309',  'EQUAL', 'valid: space separation'],
+	PHONE3 => [ '503.867.5309',  'EQUAL', 'valid: dot separation'],
+	PHONE4 => [ '503 867 5309 x227',  undef, 'WRONG: extension syntax rejectd'],
+	PHONE5 => [ '()()()',  undef, 'invalid: no digits'],
+	PHONE6 => [ '------',  undef, 'invalid: no digits'],
+	PHONE7 => [ "\n",  undef, 'invalid: no digits'],
+	PHONE8 => [ "++++",  undef, 'invalid: no digits'],
+);
+
+my $formClass = 'WebGUI::Form::Phone';
+my $formType = 'Phone';
+
+my $numTests = 12 + scalar keys %testBlock;
+
+diag("Planning on running $numTests tests\n");
+
+plan tests => $numTests;
+
+my ($header, $footer) = (WebGUI::Form::formHeader($session), WebGUI::Form::formFooter($session));
+
+my $html = join "\n",
+	$header, 
+	$formClass->new($session, {
+		name => 'TestPhone',
+		value => '(555)867-5309',
+	})->toHtml,
+	$footer;
+
+my @forms = HTML::Form->parse($html, 'http://www.webgui.org');
+
+##Test Form Generation
+
+is(scalar @forms, 1, '1 form was parsed');
+
+my @inputs = $forms[0]->inputs;
+is(scalar @inputs, 1, 'The form has 1 input');
+
+#Basic tests
+
+my $input = $inputs[0];
+is($input->name, 'TestPhone', 'Checking input name');
+is($input->type, 'text', 'Checking input type');
+is($input->value, '(555)867-5309', 'Checking default value');
+is($input->disabled, undef, 'Disabled param not sent to form');
+is($input->{size}, 30, 'Default size');
+is($input->{maxlength}, 255, 'Default maxlength');
+
+##Test Form Output parsing
+
+my $html = join "\n",
+	$header, 
+	$formClass->new($session, {
+		name => 'EuroPhone',
+		value => '123.456.7890',
+		size => 15,
+		maxlength => 20,
+	})->toHtml,
+	$footer;
+
+@forms = HTML::Form->parse($html, 'http://www.webgui.org');
+@inputs = $forms[0]->inputs;
+my $input = $inputs[0];
+is($input->name, 'EuroPhone', 'Checking input name');
+is($input->value, '123.456.7890', 'Checking default value');
+is($input->{size}, 15, 'set size');
+is($input->{maxlength}, 20, 'set maxlength');
+
+##Test Form Output parsing
+
+WebGUI::Form_Checking::auto_check($session, $formType, %testBlock);
+