diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 7e960304801e8d512990b9a2619446dfb2254e3e..f21cb981c5276d4737c7a6206d7c424ec18cd5d8 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -177,6 +177,13 @@
 		<<set $args[0].pregKnown = 0>>
 	<</if>>
 <</if>>
+<<if ndef $args[0].pregWeek>>
+	<<if $args[0].preg > 0>>
+		<<set $args[0].pregWeek = $args[0].preg>>
+	<<else>>
+		<<set $args[0].pregWeek = 0>>
+	<</if>>
+<</if>>
 <<SetBellySize $args[0]>>
 
 <<if ndef $args[0].pubertyXX>>
@@ -187,7 +194,7 @@
 	<</if>>
 <</if>>
 <<if ndef $args[0].pubertyAgeXY>>
-  <<set $args[0].pubertyAgeXY to $potencyAge>>
+  <<set $args[0].pubertyAgeXY = $potencyAge>>
 <</if>>
 <<if ndef $args[0].pubertyAgeXY>>
 	<<if $args[0].physicalAge >= $args[0].pubertyAgeXY>>